diff --git a/lib/decoder.f90 b/lib/decoder.f90
index b532c9d67..6787b879a 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -402,16 +402,18 @@ contains
     character(len=22), intent(in) :: decoded
     integer, intent(in) :: nap 
     real, intent(in) :: qual 
-    character*3 annot
-   
-    annot='   ' 
+    character*2 annot
+    character*22 decoded0
+  
+    decoded0=decoded 
+    annot='  ' 
     if(nap.ne.0) then
-      if(qual.ge.0.17) write(annot,'(a1,i1,a1)') 'a',nap,' '
-      if(qual.lt.0.17) write(annot,'(a1,i1,a1)') 'a',nap,'?'
+      write(annot,'(a1,i1)') 'a',nap
+      if(qual.lt.0.17) decoded0(22:22)='?'
     endif
-    write(*,1000) params%nutc,snr,dt,nint(freq),decoded,annot
-1000 format(i6.6,i4,f5.1,i5,' ~ ',1x,a22,3x,a3)
-    write(13,1002) params%nutc,nint(sync),snr,dt,freq,0,decoded
+    write(*,1000) params%nutc,snr,dt,nint(freq),decoded0,annot
+1000 format(i6.6,i4,f5.1,i5,' ~ ',1x,a22,1x,a2)
+    write(13,1002) params%nutc,nint(sync),snr,dt,freq,0,decoded0
 1002 format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a22,' FT8')
     call flush(6)
     call flush(13)