Index: sources/drydemo/StateControllerTreatment.cpp
===================================================================
diff -u -r521f29cb7dcd0de352dd744292488380e07cb9e3 -re8edefcae8e47854198b06c1a65e4e45da5f3afc
--- sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision 521f29cb7dcd0de352dd744292488380e07cb9e3)
+++ sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision e8edefcae8e47854198b06c1a65e4e45da5f3afc)
@@ -122,15 +122,16 @@
             _treatmentSubStates.prevDialysisSubState = _treatmentSubStates.dialysisSubState;
             _treatmentSubStates.fluidBolusState      = FLUID_BOLUS_SALINE_IN_PROGRESS_STATE;
             _treatmentSubStates.dialysisSubState     = DIALYSIS_UF_PAUSED_STATE; //DIALYSIS_UF_FLUID_BOLUS_STATE; // TODO UI goes to pause
+            _treatmentStatus.isDialysateInBypass     = true;
         }
         else {
             _treatmentStatus.totalFluidBolusDeliveredML += _treatmentStatus.accumFluidBolusDeliveredML;
             _treatmentSubStates.dialysisSubState         = _treatmentSubStates.prevDialysisSubState;
+            _treatmentStatus.isDialysateInBypass         = false;
         }
 
         _treatmentRcvdMessages[ID_UI_FLUID_BOLUS_RQST].clear();
-        handleUIResponseMessage(ID_TD_FLUID_BOLUS_RESP, ACCEPT_VALUE, {static_cast<quint32>(REQUEST_REJECT_REASON_NONE),
-                                                                       _treatmentParams.fluidBlousVolumeML});
+        handleUIResponseMessage(ID_TD_FLUID_BOLUS_RESP, ACCEPT_VALUE, {REQUEST_REJECT_REASON_NONE, _treatmentParams.fluidBlousVolumeML});
     }
 
     if (!_treatmentRcvdMessages[ID_UI_BOLUS_VOLUME_CHANGE_RQST].isNull()) {
@@ -156,6 +157,7 @@
         _treatmentSubStates.dialysisSubState         = _treatmentSubStates.prevDialysisSubState;
         _treatmentStatus.totalFluidBolusDeliveredML += _treatmentStatus.accumFluidBolusDeliveredML;
         _treatmentStatus.accumFluidBolusDeliveredML  = 0.0;        
+        _treatmentStatus.isDialysateInBypass         = false;
         // Immediately broadcast the results to be updated
         handleFluidBolusBroadcastData(BC_IMMEDIATELY);
     }