Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -r773b0b83e72af1bdc50c2643459cb0ef19c02ee6 -re50998d376110516b4d3c9c860b9cbb4f2013623
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 773b0b83e72af1bdc50c2643459cb0ef19c02ee6)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision e50998d376110516b4d3c9c860b9cbb4f2013623)
@@ -67,19 +67,17 @@
     }
 
     function ready () {
-        return _root.isHDFFeatured ? _hdfTreatmentModeControl   .isActive       && _hdfTreatmentMode          .valid            &&
-                                    _subFluidVolume             .isActive       && _subFluidVolume            .valid    : true  &&
-                _bloodFlowRate                                  .isActive       && _bloodFlowRate             .valid            &&
-                _dialysateFlowRate                              .isActive       && _dialysateFlowRate         .valid            &&
-                _duration                                       .isActive       && _duration                  .valid            &&
 
-                _ufVolume                                       .isActive       && _ufVolume                  .valid            &&
-                _root.isHDFFeatured ? _hdfTreatmentMode         .isActive       && _hdfTreatmentMode          .valid            &&
-                                      _subFluidVolume           .isActive       && _hdfTreatmentMode          .valid    : true  &&
-                _root.isHeparinOn && _root. heparinFeatured ?   _heparinRxAdjustment.confirmReady()                     : true  &&
-                _acidConcentrateComboBox                        .isActive       && _acidConcentrate           .valid            &&
-                _bicarbonateConcentrateComboBox                 .isActive       && _bicarbonateConcentrate    .valid            &&
-                _dialyzerTypeComboBox                           .isActive       && _dialyzerType              .valid            &&
+        return (_root.isHDFFeatured ?   _hdfTreatmentModeControl.isActive       && _hdfTreatmentMode          .valid                &&
+                                        _subFluidVolume         .isActive       && _subFluidVolume            .valid    : true )    &&
+                _bloodFlowRate                                  .isActive       && _bloodFlowRate             .valid                &&
+                _dialysateFlowRate                              .isActive       && _dialysateFlowRate         .valid                &&
+                _duration                                       .isActive       && _duration                  .valid                &&
+                _ufVolume                                       .isActive       && _ufVolume                  .valid                &&
+                (_root.isHeparinOn && _root. heparinFeatured ?   _heparinRxAdjustment.confirmReady()                    : true )    &&
+                _acidConcentrateComboBox                        .isActive       && _acidConcentrate           .valid                &&
+                _bicarbonateConcentrateComboBox                 .isActive       && _bicarbonateConcentrate    .valid                &&
+                _dialyzerTypeComboBox                           .isActive       && _dialyzerType              .valid                &&
                 _dialysateTemperature                           .isActive       && _dialysateTemperature      .valid
     }