Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -rf723ec214199979298efb1f98f3e4c25fdfd5073 -r6e6e587b8654dab3c596f6a905f857a3e7cf1e62
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision f723ec214199979298efb1f98f3e4c25fdfd5073)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 6e6e587b8654dab3c596f6a905f857a3e7cf1e62)
@@ -205,9 +205,10 @@
                 if ( TRUE == pendingStartDDGenDialRequest )
                 {
                     pendingStartDDGenDialRequest = FALSE;
-                    setTDDialyzerBypass(FALSE);
-                    requestNewOperationMode( DD_MODE_GEND );
                 }
+                setTDDialyzerBypass( TRUE );
+                requestNewOperationMode( DD_MODE_GEND );
+
                 break;
 
             default:
@@ -369,7 +370,7 @@
     else
     {
         // stay in this state till bicart fill complete.
-        if ( getCurrentDryBiCartPreGenFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
+        if ( getCurrentDryBiCartFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
         {
             state   = DD_PRE_GEN_FILL_CHAMBER_F;
         }