Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215 -rbcdf52a78876940b6c9ca03e43554ee18cc57b47
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision bcdf52a78876940b6c9ca03e43554ee18cc57b47)
@@ -219,6 +219,7 @@
 void execPrime( void )
 {
     HD_PRE_TREATMENT_PRIME_STATE_T priorSubState = currentPrimeState;
+
     // execute prime sub-mode state machine
     switch ( currentPrimeState )
     {
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215 -rbcdf52a78876940b6c9ca03e43554ee18cc57b47
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision bcdf52a78876940b6c9ca03e43554ee18cc57b47)
@@ -280,8 +280,10 @@
  *************************************************************************/
 void execRinseback( void )
 {
-    rinsebackTimerCtr++;
     RINSEBACK_STATE_T priorSubState = rinsebackState;
+
+    rinsebackTimerCtr++;
+
     switch ( rinsebackState )
     {
         case RINSEBACK_STOP_INIT_STATE:
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215 -rbcdf52a78876940b6c9ca03e43554ee18cc57b47
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision bcdf52a78876940b6c9ca03e43554ee18cc57b47)
@@ -182,9 +182,10 @@
  *************************************************************************/
 void execTreatmentEnd( void )
 {
-    txEndTimerCtr++;
     TREATMENT_END_STATE_T priorSubState = treatmentEndState;
 
+    txEndTimerCtr++;
+
     switch ( treatmentEndState )
     {
         case TREATMENT_END_WAIT_FOR_RINSEBACK_STATE:
Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215 -rbcdf52a78876940b6c9ca03e43554ee18cc57b47
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision bcdf52a78876940b6c9ca03e43554ee18cc57b47)
@@ -189,9 +189,10 @@
  *************************************************************************/
 void execTreatmentRecirc( void )
 {
+    TREATMENT_RECIRC_STATE_T priorSubState = treatmentRecircState;
+
     // Count time in this sub-mode
     recircTimerCtr++;
-    TREATMENT_RECIRC_STATE_T priorSubState = treatmentRecircState;
 
     switch ( treatmentRecircState )
     {
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215 -rbcdf52a78876940b6c9ca03e43554ee18cc57b47
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision bcdf52a78876940b6c9ca03e43554ee18cc57b47)
@@ -219,6 +219,7 @@
 void execTreatmentStop( void )
 {
     TREATMENT_STOP_STATE_T priorSubState = currentTxStopState;
+
     // Execute treatment stop sub-mode state machine
     switch ( currentTxStopState )
     {