Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -redcfc9c2f25ae2ab3d45d4648c22e676cac9b49f
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision edcfc9c2f25ae2ab3d45d4648c22e676cac9b49f)
@@ -628,12 +628,13 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE1_VALVES_CLOSE;
-    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
-    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
 
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
+
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
     if ( TRUE == isFreshDialysatePressureInRange && TRUE == isSpentDialysatePressureInRange )
     {
@@ -791,12 +792,14 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE2_VALVES_CLOSE;
-    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
-    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
 
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
+
+
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
     if ( ( TRUE == isFreshDialysatePressureInRange ) && ( TRUE == isSpentDialysatePressureInRange ) )
     {