Index: firmware/App/Modes/StatePreTxHeparinSetup.c
===================================================================
diff -u -r1233ccac080bb953acde0a9bde41607a7d0ff170 -r8a3f16888f564619ab04fe904e4acbe9e8c24117
--- firmware/App/Modes/StatePreTxHeparinSetup.c	(.../StatePreTxHeparinSetup.c)	(revision 1233ccac080bb953acde0a9bde41607a7d0ff170)
+++ firmware/App/Modes/StatePreTxHeparinSetup.c	(.../StatePreTxHeparinSetup.c)	(revision 8a3f16888f564619ab04fe904e4acbe9e8c24117)
@@ -271,7 +271,7 @@
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
                                        SW_FAULT_ID_TD_INVALID_PRE_TX_HEPARIN_SETUP_STATE,
-                                       currentPreTxHeparinSetupState );
+                                       state );
             break;
     }
 }
@@ -543,7 +543,7 @@
                 state = PRE_TX_HEPARIN_SETUP_PRELOAD_STATE;
                 break;
 
-             // Resume confirms syringe loading and continues to Seek.
+             // Resume returns to awaiting syringe load confirmation.
             case PRE_TX_HEPARIN_SETUP_AWAIT_SYRINGE_LOAD_CONFIRMATION_STATE:
                 state = PRE_TX_HEPARIN_SETUP_AWAIT_SYRINGE_LOAD_CONFIRMATION_STATE;
                 break;