diff --git a/lib/msk40decodeframe.f90 b/lib/msk40decodeframe.f90
index 5f0ddc11a..8586ea85a 100644
--- a/lib/msk40decodeframe.f90
+++ b/lib/msk40decodeframe.f90
@@ -135,21 +135,23 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray,             &
       write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall),   &
                                     trim(hiscall),">",rpt(nrxrpt)
       return
-    elseif(bswl .and. nhammd.le.4 .and. cord.lt.0.65) then
+    elseif(bswl .and. nhammd.le.2 .and. cord.lt.0.25 .and. xsnr .gt. 0.0) then
       do i=1,nrecent
         do j=i+1,nrecent
           if( nrxhash .eq. nhasharray(i,j) ) then
             nsuccess=1
             write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(recent_calls(i)),   &
                                   trim(recent_calls(j)),">",rpt(nrxrpt)
+!write(*,*) 'decodeframe ',nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma
           elseif( nrxhash .eq. nhasharray(j,i) ) then
             nsuccess=1
             write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(recent_calls(j)),   &
                                   trim(recent_calls(i)),">",rpt(nrxrpt)
+!write(*,*) 'decodeframe ',nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma
           endif
         enddo
       enddo
-      if( nsuccess .eq. 0 .and. nhammd.le.1 .and. cord .lt. 0.65 ) then
+      if(nsuccess.eq.0 .and. nhammd.le.1 .and. cord.lt.0.10 .and. xsnr.gt.3.0 ) then
 !write(*,*) 'decodeframe ',nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma
         nsuccess=1
         write(msgreceived,'(a1,i4.4,a1,1x,a4)') "<",nrxhash,">",rpt(nrxrpt)