diff --git a/lib/mskrtd.f90 b/lib/mskrtd.f90
index 71a1f0396..5712c71ac 100644
--- a/lib/mskrtd.f90
+++ b/lib/mskrtd.f90
@@ -208,8 +208,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,   &
      nsnrlast=nsnr
      if(.not. bshdecode) then
         call update_hasharray(recent_calls,nrecent,nhasharray)
-! Should we call fix_contest_msg() only if bcontest is true?
-        call fix_contest_msg(mygrid,msgreceived)
+        if(bcontest) call fix_contest_msg(mygrid,msgreceived)
      endif
      write(line,1020) nutc0,nsnr,tdec,nint(fest),decsym,msgreceived,           &
           navg,ncorrected,eyeopening,char(0)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 549f162dc..8cbe45367 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3817,7 +3817,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
     warnMsg=tr("Should you be operating in NA VHF Contest mode?");
     nWarn=1;
   }
-  if((m_mode=="FT8" or m_mode=="MSK144") and hisgrid.length()==4 and
+  if((m_mode=="FT8" or m_mode=="MSK144") and hisgrid.contains(grid_regexp) and
      m_rigState.frequency()>50000000 and !m_bCheckedContest) {
     double utch=0.0;
     int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter;