Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -r8483d8dd3ceccefc737eac09f1e2bef772f22a06
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8483d8dd3ceccefc737eac09f1e2bef772f22a06)
@@ -1329,6 +1329,8 @@
         }
         else
         {
+            setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
+            setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             stateTimer   = getMSTimerCount();
             state        = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
@@ -1363,7 +1365,7 @@
         setValveState( VPI, VALVE_STATE_OPEN );
         setValveState( VRD1, VALVE_STATE_OPEN );
         setValveState( VBF, VALVE_STATE_CLOSED );
-        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );