Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r943d8be36db108f59b7839aafc975735191ab24e
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 943d8be36db108f59b7839aafc975735191ab24e)
@@ -520,17 +520,14 @@
             break;
 
         case ALARM_ACTION_END_TREATMENT:
-            if ( HD_PRE_TREATMENT_PRIME_STATE > currentPreTreatmentState )
+            if ( currentPreTreatmentState > HD_PRE_TREATMENT_WATER_SAMPLE_STATE )
             {
-                if ( HD_PRE_TREATMENT_WATER_SAMPLE_STATE == currentPreTreatmentState )
-                {
-                    cmdDGSampleWater( SAMPLE_WATER_CMD_END );
-                }
-                requestNewOperationMode( MODE_STAN );
+                requestNewOperationMode( MODE_POST );
             }
             else
             {
-                requestNewOperationMode( MODE_POST );
+                requestNewOperationMode( MODE_STAN );
+                cmdStopDG();
             }
             break;