diff --git a/lib/ft8/ft8b_2.f90 b/lib/ft8/ft8b_2.f90
index 3330d1706..2adb37151 100644
--- a/lib/ft8/ft8b_2.f90
+++ b/lib/ft8/ft8b_2.f90
@@ -358,7 +358,7 @@ write(*,*) apmag,lapon,lapcqonly,npasses,nQSOProgress
         cycle
      endif
      nbadcrc=0  ! If we get this far: valid codeword, valid (i3,n3), nonquirky message.
-     call genft8_174_91(msg37,i3g,n3g,msgsent37,msgbits,itone)
+     call get_tones_from_77bits(message77,itone)
      if(lsubtract) call subtractft8(dd0,itone,f1,xdt) 
      xsig=0.0
      xnoi=0.0
diff --git a/lib/ft8/genft8_174_91.f90 b/lib/ft8/genft8_174_91.f90
index 7017a84d2..a9e8d7007 100644
--- a/lib/ft8/genft8_174_91.f90
+++ b/lib/ft8/genft8_174_91.f90
@@ -17,12 +17,14 @@ subroutine genft8_174_91(msg,i3,n3,msgsent,msgbits,itone)
   i3=-1
   n3=-1
   call pack77(msg,i3,n3,c77)
-  call unpack77(c77,msgsent,unpk77_success)
 
   read(c77,'(77i1)',err=1) msgbits
   go to 2
 1 write(81,*) msg,c77 ; flush(81)
-2 call encode174_91(msgbits,codeword)      !Encode 77-bit msg into codeword  
+
+entry get_tones_from_77bits(msgbits,itone) 
+
+2  call encode174_91(msgbits,codeword)      !Encode the test message
 
 ! Message structure: S7 D29 S7 D29 S7
   itone(1:7)=icos7