diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90
index 16cf4f05f..ce74b5646 100644
--- a/lib/ft8/foxgen.f90
+++ b/lib/ft8/foxgen.f90
@@ -34,20 +34,18 @@ subroutine foxgen(bSuperFox,fname)
   equivalence (x,cx),(y,cy)
 
   if(bSuperFox) then
+     n=nslots
      if(bMoreCQs) cmsg(1)(40:40)='1'               !Set flag to include a CQ
-!     print*,'A',bMoreCQs,bSendMsg,nslots,textMsg
      if(bSendMsg) then
-        cmsg(1)(39:39)='1'                         !Set flag for text message
         n=min(nslots+1,3)
         cmsg(n)=textMsg
-!        do i=1,n
-!           print*,'CC',i,cmsg(i)
-!        enddo
+        cmsg(n)(39:39)='1'                         !Set flag for text message
+        nslots=n
      endif
      open(25,file=fname,status='unknown')
-     write(25,'(a40)') cmsg(1:nslots)
+     write(25,'(a40)') cmsg(1:n)
      close(25)
-     return
+     go to 999
   endif
 
   fstep=60.d0
@@ -87,7 +85,7 @@ subroutine foxgen(bSuperFox,fname)
   peak3=maxval(abs(wave))
   wave=wave/peak3
   
-  return
+999 return
 end subroutine foxgen
 
 ! include 'plotspec.f90'
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 698ae1529..e0486b0dc 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -9884,7 +9884,10 @@ void MainWindow::on_pbFreeText_clicked()
   bool ok;
   m_freeTextMsg = QInputDialog::getText (this, tr("Free Text Message"),
          tr("Message:"), QLineEdit::Normal, m_freeTextMsg0, &ok);
-  if(ok) m_freeTextMsg0=m_freeTextMsg;
+  if(ok) {
+    m_freeTextMsg=m_freeTextMsg.toUpper();
+    m_freeTextMsg0=m_freeTextMsg;
+  }
 }
 
 void MainWindow::on_comboBoxHoundSort_activated(int index)