diff --git a/qmap/libqmap/chkstat.f90 b/qmap/libqmap/chkstat.f90
index 6d5680338..0bb7051e5 100644
--- a/qmap/libqmap/chkstat.f90
+++ b/qmap/libqmap/chkstat.f90
@@ -18,7 +18,6 @@ subroutine chkstat(dd,ihsym,bSkip)
   n2=count(power(31:60).lt.15.0)
   if(ihsym.le.200 .and. n1.gt.15) bSkip=.true.
   if(ihsym.gt.200 .and. n2.gt.15) bSkip=.true.
-!  print*,'A',ihsym,n1,n2,bSkip
 
   return
 end subroutine chkstat
diff --git a/qmap/libqmap/qmapa.f90 b/qmap/libqmap/qmapa.f90
index 3d063d133..288b87570 100644
--- a/qmap/libqmap/qmapa.f90
+++ b/qmap/libqmap/qmapa.f90
@@ -79,6 +79,7 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb,         &
 ! Don't start another decode attempt if it's too late...
      if(nhsym.eq.330 .and. tsec.gt.6.0) exit
      if(tsec.gt.16.0) exit
+     if(bClickDecode .and. idec.ge.0) exit
   enddo  ! icand
 
   return