diff --git a/lib/genmsk32.f90 b/lib/genmsk32.f90
index 04c934164..53fb95035 100644
--- a/lib/genmsk32.f90
+++ b/lib/genmsk32.f90
@@ -4,7 +4,7 @@ subroutine genmsk32(msg,msgsent,ichk,itone,itype)
   character*22 msg,msgsent,hashmsg
   character*4 crpt,rpt(0:31)
   logical first
-  integer itone(32)
+  integer itone(144)
   integer ig24(0:4096-1)                  !Codewords for Golay (24,12) code
   integer*1 codeword(24),bitseq(32)
   integer*1 s8r(8)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 293ad9e41..96a8a84f0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4897,6 +4897,7 @@ void MainWindow::transmit (double snr)
       if(itone[35] < 0) nsym=35;
     } else {
       nsym=NUM_MSK144_SYMBOLS;
+      if(itone[32] < 0) nsym=32;
     }
     Q_EMIT sendMessage (nsym, double(m_nsps), f0, m_toneSpacing,
                         m_soundOutput, m_config.audio_output_channel (),