Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -raf80aaa1c114eab78444e973c86b3c42dd85ef52 -rfdddcd8b25b5acc99f8c044c998af0e95752063c
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision af80aaa1c114eab78444e973c86b3c42dd85ef52)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision fdddcd8b25b5acc99f8c044c998af0e95752063c)
@@ -178,7 +178,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 +294,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 +313,7 @@
                         _heparinRxAdjustment.open()
                     }
                     else {
-                        reset()
+                        _heparinRx.reset()
                     }
                 }
             }