Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r65a72f68f34ed506bf99c8cf52b339cb5bad11db -r7de21ac8b699cafdfeaefbf2c062c3e21bcc956d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 65a72f68f34ed506bf99c8cf52b339cb5bad11db)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 7de21ac8b699cafdfeaefbf2c062c3e21bcc956d)
@@ -959,9 +959,14 @@
 
     if ( TRUE == fillReservoirOneStartRequested )
     {
-        fillReservoirOneStartRequested = FALSE;
-        cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-        state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
+        DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+        rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_2;
+        rsrvrCmd.useLastTrimmerHeaterDC = FALSE;
+        fillReservoirOneStartRequested  = FALSE;
+        state                           = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
+
+        cmdSetDGActiveReservoir( &rsrvrCmd );
     }
 
     return state;
@@ -1166,12 +1171,24 @@
                 else
 #endif
                 {
+                    DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+                    rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_1;
+                    rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                     reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
+
+                    cmdSetDGActiveReservoir( &rsrvrCmd );
                 }
             }
             else
             {
+                DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+                rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_2;
+                rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                 reservoirFlushedStatus[ DG_RESERVOIR_2 ] = TRUE;
+
+                cmdSetDGActiveReservoir( &rsrvrCmd );
             }
         }
     }
@@ -1197,8 +1214,13 @@
     //wait after drain or fill
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
+        DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+        rsrvrCmd.reservoirID            = (U32)inactiveReservoir;
+        rsrvrCmd.useLastTrimmerHeaterDC = FALSE;
+
         state = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
-        cmdSetDGActiveReservoir( inactiveReservoir );
+        cmdSetDGActiveReservoir( &rsrvrCmd );
     }
 
     return state;