Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rdfa14665d19fa4df4166412becdf01cbcd157c96 -rea0ed778cde80abbb042a8a0a8ef56b3a434dfb2
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision dfa14665d19fa4df4166412becdf01cbcd157c96)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ea0ed778cde80abbb042a8a0a8ef56b3a434dfb2)
@@ -779,7 +779,9 @@
     if ( TRUE == treatmentStartRequested )
     {
         DG_RESERVOIR_ID_T const activeRes = getDGActiveReservoir();
+
         setStartReservoirVolume( activeRes );
+        resetHeparinVolumeDelivered();  // get clean starting volume/position before we start treatment
         requestNewOperationMode( MODE_TREA );
     }
 
@@ -884,7 +886,7 @@
         if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
         {
             state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_RESP_STATE;
-            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, FALSE );
+            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, FALSE, TRUE );
         }
     }