Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -raf80aaa1c114eab78444e973c86b3c42dd85ef52 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision af80aaa1c114eab78444e973c86b3c42dd85ef52)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35)
@@ -14,7 +14,7 @@
     readonly property bool heparinFeatured  : vSettings.heparinSyringePump
     readonly property string patientID      : _pretreatmentPatientIDEntry.text
     property bool isHDFFeatured             : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF
-    property bool isHeparinOn               :  _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON
+    property bool isHeparinOn               :  _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
 
     property bool editingEnabled            : true
     property int columnSpacing              : 15
@@ -71,7 +71,6 @@
     }
 
     function ready () {
-
         return (_root.isHDFFeatured ?   _hdfTreatmentModeControl.isActive       && _hdfTreatmentMode          .valid                &&
                                         _subFluidVolume         .isActive       && _subFluidVolume            .valid    : true )    &&
                 _bloodFlowRate                                  .isActive       && _bloodFlowRate             .valid                &&
@@ -178,7 +177,7 @@
             step            : vTreatmentRanges.substitutionVolumeRes
             defaultValue    : vTreatmentRanges.substitutionVolumeDef
             decimal         : Variables.substitutionPrecision
-            value           : vTreatmentCreate.substitutionFluidVolume
+            value           : _root.isHDFFeatured ? vTreatmentCreate.substitutionFluidVolume : 0
             isActive        : vTreatmentCreate.substitutionFluidVolumeSet
 
             onDidActiveChange   : function(vState) {  vTreatmentCreate.substitutionFluidVolumeSet = vState }
@@ -294,7 +293,7 @@
             visible         : _root.heparinFeatured
             showEdit        : true
             needsAttention  : ! _heparinRxAdjustment.confirmReady()
-            editEnabled     : _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON
+            editEnabled     : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
 
             function reset() {
                 vTreatmentCreate.heparinBolusVolume       = 0
@@ -313,7 +312,7 @@
                         _heparinRxAdjustment.open()
                     }
                     else {
-                        reset()
+                        _heparinRx.reset()
                     }
                 }
             }