Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r65292e443646d135d8fcad0a2eda19d844b06dff -rdb2df05586608658c7bbd0dbd66aeba03068b16d
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 65292e443646d135d8fcad0a2eda19d844b06dff)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision db2df05586608658c7bbd0dbd66aeba03068b16d)
@@ -216,10 +216,10 @@
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
 #ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
 #endif
 
             // Turn on the primary heater
@@ -247,7 +247,6 @@
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
 
@@ -271,6 +270,7 @@
             setValveState( D40_VALV, VALVE_STATE_OPEN );    // VDO
 #ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
 #endif
             break;
 
@@ -283,6 +283,7 @@
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
 #ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
 #endif
             setValveState( D47_VALV, VALVE_STATE_OPEN );    // Spent chamber purge valve
 
@@ -319,9 +320,9 @@
 
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
 #ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
 #endif
             bicarbFillStartTimeMS = getMSTimerCount();
 
@@ -361,7 +362,6 @@
             setValveState( D40_VALV, VALVE_STATE_CLOSED );
             setValveState( D31_VALV, VALVE_STATE_CLOSED );
             setValveState( D47_VALV, VALVE_STATE_CLOSED );
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D54_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_CLOSED );
             setValveState( D52_VALV, VALVE_STATE_CLOSED );
@@ -375,6 +375,7 @@
             setValveState( D53_VALV, VALVE_STATE_OPEN );
 #ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
 #endif
             break;