diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 04d447158..e3495ee27 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -170,8 +170,8 @@ contains
     ibwa=1                          !Q65-60A
     if(mode_q65.eq.2) ibwa=3        !Q65-60B
     if(mode_q65.eq.4) ibwa=8        !Q65-60C
-    if(mode_q65.eq.2) ibwa=9        !Q65-60D
-    if(mode_q65.eq.2) ibwa=10       !Q65-60E
+    if(mode_q65.eq.8) ibwa=8        !Q65-60D
+    if(mode_q65.eq.16) ibwa=8       !Q65-60E
 !###
 
 !    ibwb=min(15,ibwa+4)
@@ -180,7 +180,7 @@ contains
     if(iand(ndepth,3).eq.2) maxiters=60
     if(iand(ndepth,3).eq.3) then
        ibwa=max(1,ibwa-2)
-       ibwb=ibwb+2
+       ibwb=min(15,ibwb+2)
        maxiters=100
     endif
 
diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90
index cb033efa4..94eb60ced 100644
--- a/lib/qra/q65/q65.f90
+++ b/lib/qra/q65/q65.f90
@@ -168,7 +168,7 @@ subroutine q65_dec0(iavg,iwave,ntrperiod,nfqso,ntol,lclearave,  &
           better,ccf1)
      call timer('ccf_85  ',1)
 
-     if(better.ge.1.10) then
+     if(better.ge.1.10 .or. mode_q65.ge.8) then
         call timer('list_dec',0)
         call q65_dec_q3(s1,iz,jz,s3,LL,ipk,jpk,snr2,dat4,idec,decoded)
         call timer('list_dec',1)