Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r61619248709d1360bb371142c59ddeb7ac6ba0d3 -r54abf84364e737dd350153d5fab7dd652f917ef4
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 61619248709d1360bb371142c59ddeb7ac6ba0d3)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2022-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2022-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeHeatDisinfectActiveCool.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      28-Jul-2023
+* @date    (last)      09-Sep-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  18-Dec-2022
@@ -627,6 +627,7 @@
         // The drain is set to start from reservoir 2 since all the actuators have been de-energized
         // Set the drain valve to reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setDrainPumpTargetRPM( targetRPM );
 
         // Start the timer for drain timeout
@@ -770,15 +771,19 @@
     {
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-            // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
-            // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
-            heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
-            heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
-            alarmDetectedPendingTrigger      = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
-
-            if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+            if ( ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE ) &&
+                 ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE ) )
             {
-                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
+                // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
+                heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
+                heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
+                alarmDetectedPendingTrigger      = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+                if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                }
             }
         }
     }