Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -r8752be6dad093564d924e5572ee8756699de0071 -r07d08d88c15fdce1e46ec341034c909807694f0a
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 8752be6dad093564d924e5572ee8756699de0071)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 07d08d88c15fdce1e46ec341034c909807694f0a)
@@ -609,11 +609,9 @@
     // stay in this state till bicart request is cleared so that fill complete status can be checked
     DRY_BICART_FILL_EXEC_STATE_T state  = DRY_BICART_FILL_COMPLETE_STATE;
 
-    // Go idle when request cleared
-    if ( FALSE == getU32OverrideValue( &dryBiCartFillRequested ) )
-    {
-            state = DRY_BICART_START_STATE;
-    }
+    // Go idle
+    dryBiCartFillRequested.data = FALSE;
+    state = DRY_BICART_START_STATE;
 
     return state;
 }
@@ -990,11 +988,9 @@
     // stay in this state till drain request is cleared so that Drain completion status can be checked
     DRY_BICART_DRAIN_EXEC_STATE_T state = DRY_BICART_FLUID_DRAIN_END_STATE;
 
-    // Go idle when request cleared
-    if ( FALSE == getU32OverrideValue( &dryBiCartDrainRequested ) )
-    {
-        state = DRY_BICART_DRAIN_START_STATE;
-    }
+    // Go idle
+    dryBiCartDrainRequested.data = FALSE;
+    state = DRY_BICART_DRAIN_START_STATE;
 
     return state;
 }
@@ -1022,7 +1018,7 @@
         data.dryBiCartMaxFillCycleCount         = getU32OverrideValue( &biCartMaxFillCycleCount );
         data.dryBiCartFillRequest               = getU32OverrideValue( &dryBiCartFillRequested );
         data.bicarbChamberFillRequest           = getU32OverrideValue( &bicarbChamberFillRequested );
-        data.dryBiCartDrainRequested            = getU32OverrideValue( &dryBiCartDrainRequested );
+        data.dryBiCartDrainRequest              = getU32OverrideValue( &dryBiCartDrainRequested );
         data.dryBiCartLastFillTime              = lastFillDurationInMS;
         data.dryBiCartCurrentFillTime         	= currentFillDurationInMS;
         data.dryBiCartType                      = getU32OverrideValue( &dryBiCartType );
Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -r8752be6dad093564d924e5572ee8756699de0071 -r07d08d88c15fdce1e46ec341034c909807694f0a
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 8752be6dad093564d924e5572ee8756699de0071)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 07d08d88c15fdce1e46ec341034c909807694f0a)
@@ -42,7 +42,7 @@
     U32 dryBiCartMaxFillCycleCount;                                     ///< Dry bicart fill cycle max count
     U32 dryBiCartFillRequest;                                           ///< Dry bicart fill request
     U32 bicarbChamberFillRequest;                                       ///< Bicarb chamber fill request
-    U32 dryBiCartDrainRequested;                                        ///< Dry bicart drain request
+    U32 dryBiCartDrainRequest;                                          ///< Dry bicart drain request
     U32 dryBiCartLastFillTime;                                          ///< Dry bicart last fill duration in milli second
     U32 dryBiCartCurrentFillTime;                                       ///< Dry bicart current fill duration in milli second
     U32 dryBiCartType;                                                  ///< Dry bicart type (small-0/large-1)