diff --git a/lib/decode9w.f90 b/lib/decode9w.f90
index 60b769bde..b4f02c628 100644
--- a/lib/decode9w.f90
+++ b/lib/decode9w.f90
@@ -42,7 +42,7 @@ subroutine decode9w(nutc,nfqso,ntol,nsubmode,ss,id2,sync,nsnr,xdt1,f0,decoded)
      ccfblue=(ccfblue-base)/rms
   enddo
 
-  call softsym9w(id2,npts,xdt0,f0,a(4)*df,nsubmode,xdt1,i1softsymbols)
+  call softsym9w(id2,npts,xdt0,f0,a(4)*df,nsubmode,xdt1-1.05,i1softsymbols)
   call jt9fano(i1softsymbols,limit,nlim,decoded)
 
   return
diff --git a/lib/sync9w.f90 b/lib/sync9w.f90
index f6797535c..f69720d78 100644
--- a/lib/sync9w.f90
+++ b/lib/sync9w.f90
@@ -74,6 +74,8 @@ subroutine sync9w(ss,nzhsym,lag1,lag2,ia,ib,ccfred,ccfblue,ipkbest,lagpk,nadd)
         lagpk=lag
      endif
   enddo
+  if(lagpk.eq.-9) lagpk=-8                !Protect the ends of ccfblue()
+  if(lagpk.eq.18) lagpk=17
 
   return
 end subroutine sync9w