diff --git a/map65/libm65/display.f90 b/map65/libm65/display.f90
index e5bd24f2d..5cefd796b 100644
--- a/map65/libm65/display.f90
+++ b/map65/libm65/display.f90
@@ -11,7 +11,7 @@ subroutine display(nkeep,ftol)
   real*8 f0
 
   out0=' '
-  rewind 26
+  rewind(26)
 
   do i=1,MAXLINES
      read(26,1010,end=10) line(i)
@@ -46,7 +46,7 @@ subroutine display(nkeep,ftol)
      enddo
 20   i0=i
      nz=nz-i0+1
-     rewind 26
+     rewind(26)
      if(nz.lt.1) go to 999
      do i=1,nz
         j=i+i0-1
diff --git a/map65/libm65/m65a.f90 b/map65/libm65/m65a.f90
index d5387f5a1..ddf48bce9 100644
--- a/map65/libm65/m65a.f90
+++ b/map65/libm65/m65a.f90
@@ -91,8 +91,11 @@ subroutine m65c(dd,ss,savg,nparams0)
 1000 format(/'UTC Date: 'a17/78('-'))
      flush(21)
   endif
-  if(iand(nrxlog,2).ne.0) rewind 21
-  if(iand(nrxlog,4).ne.0) rewind 26
+  if(iand(nrxlog,2).ne.0) rewind(21)
+  if(iand(nrxlog,4).ne.0) then
+     if(nhsym.eq.nhsym1) rewind(26)
+     if(nhsym.eq.nhsym2) backspace(26)
+  endif
 
   nstandalone=0
   if(sum(nparams).ne.0) call decode0(dd,ss,savg,nstandalone)
diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90
index 8db456529..fa29dac65 100644
--- a/map65/libm65/map65a.f90
+++ b/map65/libm65/map65a.f90
@@ -54,7 +54,9 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb,        &
   xpol=(nxpol.ne.0)
   
 ! No second decode for JT65?
-  if(nhsym.eq.nhsym2 .and. (nstandalone.eq.1 .or. ndiskdat.eq.0)) mode65=0
+!  if(nhsym.eq.nhsym2 .and. (nstandalone.eq.1 .or. ndiskdat.eq.0)) mode65=0
+  if(nhsym.eq.nhsym2 .and. nagain.eq.0) mode65=0
+!  print*,'=a',nhsym,nagain,mode65
 
   if(nagain.eq.0) then
      call timer('get_cand',0)