Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r4f3b9e168915ab13dfcdc74462d7142115cc2d57 -r7dde63e8cd0448c5bd06b1628c261952587ac337
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4f3b9e168915ab13dfcdc74462d7142115cc2d57)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 7dde63e8cd0448c5bd06b1628c261952587ac337)
@@ -219,8 +219,10 @@
         initRinseback();
         initTreatmentRecirc();
         initTreatmentEnd();
+
     }
 
+    currentTreatmentState = TREATMENT_START_STATE;
     setCurrentSubState( NO_SUB_STATE );
     // Enable venous bubble detection in treatment mode
     setVenousBubbleDetectionEnabled( TRUE );
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r16a2bacb1350a9649c90e7e9418a2003e0a9d5ad -r7dde63e8cd0448c5bd06b1628c261952587ac337
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 16a2bacb1350a9649c90e7e9418a2003e0a9d5ad)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7dde63e8cd0448c5bd06b1628c261952587ac337)
@@ -2041,7 +2041,7 @@
                 break;
 
             case WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE:
-                state = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
+                state = WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE;
                 break;
 
             case WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE:
@@ -2050,9 +2050,6 @@
                 break;
 
             case WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE:
-                state = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
-                break;
-
             case WET_SELF_TESTS_COMPLETE_STATE:
                 state = WET_SELF_TESTS_COMPLETE_STATE;