diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 7869527d7..3c770670c 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -119,12 +119,13 @@ contains
 
     inquire(file='ndepth.dat',exist=ex)
     if(.not.ex) ndepth=iand(ndepth,not(3)) + 1    !Treat any ndepth as "Fast"
-    maxiters=67
+    maxiters=33
     ibwa=max(1,int(1.8*log(baud*mode_q65)) + 1)
-    ibwb=min(10,ibwa+4)
+    ibwb=min(10,ibwa+2)
     if(iand(ndepth,3).ge.2) then
        ibwa=max(1,int(1.8*log(baud*mode_q65)) + 1)
        ibwb=min(10,ibwa+5)
+       maxiters=67
     else if(iand(ndepth,3).eq.3) then
        ibwa=max(1,ibwa-1)
        ibwb=min(10,ibwb+1)
diff --git a/lib/qra/q65/q65_loops.f90 b/lib/qra/q65/q65_loops.f90
index fe483d948..8b1df6a9c 100644
--- a/lib/qra/q65/q65_loops.f90
+++ b/lib/qra/q65/q65_loops.f90
@@ -25,16 +25,20 @@ subroutine q65_loops(c00,npts2,nsps2,nsubmode,ndepth,jpk0,    &
   s3lim=20.
   baud=6000.0/nsps2
 
-  idfmax=3
-  idtmax=3
+  idfmax=1
+  idtmax=1
+  maxdist=4
   ibw0=(ibwa+ibwb)/2
-  maxdist=5
-  if(iand(ndepth,3).ge.2) then
+  if(iand(ndepth,3).eq.2) then
+     idfmax=3
+     idtmax=3
+     maxdist=5
+  endif
+  if(iand(ndepth,3).eq.3) then
      idfmax=5
      idtmax=5
-     maxdist=10
+     maxdist=15
   endif
-  if(iand(ndepth,3).eq.3) maxdist=15
 
   napmin=99
   xdt1=xdt0