Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -ra6586ea871f21a08e7d50552983360fb5e344b3a -r930128c05f11253bddce102380f4512dbb454aae
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision a6586ea871f21a08e7d50552983360fb5e344b3a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 930128c05f11253bddce102380f4512dbb454aae)
@@ -131,21 +131,30 @@
             Connections { target : _heparinDispensingRateSwitch
                 function onActiveChanged    ( ) {
                     let mActive = _heparinDispensingRateSwitch.active
-                    let mObject = _heparinBolusVolumeSwitch
+                    let mObject = _heparinStopTime
 
-                    mObject.active          = mActive
-                    mObject.enabled         = mActive
+                    if ( ! mActive ) {
+                        mObject.enabled = false
+                        mObject.active  = false
+                    }
                 }
 
                 function onCheckedChanged   ( ) {
+                    let mActive  = _heparinDispensingRateSwitch.active
                     let mChecked = _heparinDispensingRateSwitch.checked
-                    let mObject = _heparinBolusVolumeSwitch
+                    let mObject  = _heparinStopTime
 
-                    mObject.enabled         = mChecked
                     if ( ! mChecked ) {
-                        mObject.checked     = false
+                        mObject.enabled = false
+                        mObject.value   = 0
+                        if ( mActive ) {
+                            mObject.active = true
+                        }
                     }
-                    mObject.onCheckedChanged( ) // emit the signal
+                    else { // already active
+                        mObject.enabled = true
+                        mObject.active  = true
+                    }
                 }
             }
 
@@ -255,8 +264,6 @@
                     height  : 85    // these values are set to align the switch with slider
                     // DEBUG: background      : Rectangle { color : "white" }
 
-                    enabled : false // this switch dipends on the heparin dispencing
-
                     indicator: Rectangle {
                         implicitWidth   : Variables.sliderCircleDiameter * 1.7
                         implicitHeight  : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 )
@@ -302,6 +309,8 @@
                 value       : vTreatmentRanges.heparinStopTimeDef
                 onPressed   : vTreatmentCreate.heparinStopTime = value
                 onReleased  : vTreatmentCreate.heparinStopTime = value
+                enabled     : false // this switch dipends on the heparin dispencing
+
             }
 
             SliderCreateTreatment { id: _salineBolus