diff --git a/commons.h b/commons.h
index 140c69c6d..0a3872048 100644
--- a/commons.h
+++ b/commons.h
@@ -85,7 +85,7 @@ extern struct {
 } echocom_;
 
 extern struct {
-  float wave[14278656];
+  float wave[(160+2)*134400*4]; /* (nsym+2)*nsps scaled up to 48kHz */
   int   nslots;
   int   nfreq;
   int   i3bit[5];
diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90
index 5aa114ac4..13299da89 100644
--- a/lib/ft8/foxgen.f90
+++ b/lib/ft8/foxgen.f90
@@ -15,7 +15,7 @@ subroutine foxgen()
   ! common block.
   
   parameter (NN=79,ND=58,NSPS=4*1920)
-  parameter (NWAVE=(160+2)*134400) !the biggest waveform we generate (FST240-1800)
+  parameter (NWAVE=(160+2)*134400*4) !the biggest waveform we generate (FST240-1800 at 48kHz)
   parameter (NFFT=614400,NH=NFFT/2)
   character*40 cmsg
   character*37 msg,msgsent
diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp
index 160f55b10..5853e07f6 100644
--- a/widgets/plotter.cpp
+++ b/widgets/plotter.cpp
@@ -420,6 +420,8 @@ void CPlotter::DrawOverlay()                   //DrawOverlay()
     if(m_TRperiod==60) nsps=4000;
     if(m_TRperiod==120) nsps=8400;
     if(m_TRperiod==300) nsps=21504;
+    if(m_TRperiod==900) nsps=66560;
+    if(m_TRperiod==1800) nsps=134400;
     float baud=12000.0/nsps;
     bw=3.0*h*baud;
   }