Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r56410a2475a4a6d1aa93642c630cdf37683d3231 -ra813f0b735381aa078a7f251903cd765cb6001b3
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 56410a2475a4a6d1aa93642c630cdf37683d3231)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a813f0b735381aa078a7f251903cd765cb6001b3)
@@ -887,14 +887,14 @@
     U32 totalSpentChamberFill       = getTotalSpentChamberFillCounts();
 
     // Latch the fill count once, at the moment level first goes HIGH
-    if ( ( LEVEL_STATE_HIGH == getLevelStatus( D46_LEVL ) ) && ( FALSE == scFillWaitActive ) )
+    if ( ( LEVEL_STATE_HIGH == spentChamberLevel ) && ( FALSE == scFillWaitActive ) )
     {
         scFillWaitStart  = totalSpentChamberFill;
         scFillWaitActive = TRUE;
     }
 
     // High level confirmed after wait count, or total fill count exceeded
-    if ( ( ( LEVEL_STATE_HIGH == getLevelStatus( D46_LEVL ) ) && ( ( scFillWaitStart + SPENT_CHAMBER_FILL_WAIT_COUNT ) == totalSpentChamberFill ) ) ||
+    if ( ( ( LEVEL_STATE_HIGH == spentChamberLevel ) && ( ( scFillWaitStart + SPENT_CHAMBER_FILL_WAIT_COUNT ) == totalSpentChamberFill ) ) ||
          ( totalSpentChamberFill >= SPENT_CHAMBER_FILL_MAX_COUNT ) )
     {
         setModeGenDStateTransition( DD_GEND_DIALYSATE_BYPASS_STATE );