Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r1a614320ec16b956d14c644ac2e90833f5cbdbcf -r036d378b4b89db03c812584c1d0f682494d81568
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
@@ -221,19 +221,8 @@
             Connections { target: _duration
                 function onValueChanged     ( ) {
                     if ( _heparinDispensingRateSwitch.checked ) {
-
-                        // FIXME: LEAHI
-                        ////////////////////////////////////////////////////////////////
-                        // depending on the feedback the approach could be differnet. //
-                        ////////////////////////////////////////////////////////////////
-
-                        //A: Deactive the hheparin stop time and let the usere re-set the value
                         _heparinStopTime.active = false
-
-                        //B: Leave the set value on heparin stop time and just fix if exceeds max.
-                        if ( _heparinStopTime.value > _duration.value ) {
-                            _heparinStopTime.reset( _duration.value )
-                        }
+                        _heparinStopTime.reset( _duration.value )
                     }
                 }
             }
@@ -256,10 +245,10 @@
                     let mObject  = _heparinStopTime
 
                     mObject.enabled     = mActive && mChecked
-                    mObject.active      = mActive && ! mChecked
+                    mObject.active      = false
                     mObject.adjustable  = mChecked
 
-                    if ( ! mChecked ) mObject.reset ( 0 )
+                    mObject.reset ( _duration.value )
                 }
             }
 
@@ -428,9 +417,10 @@
                 flickable   : _flickable
                 unit        : Variables.unitTextDuration
                 minimum     : vTreatmentRanges.heparinStopTimeMin
-                maximum     : _duration.value   // vTreatmentRanges.heparinStopTimeMax  // this maximum depends on the Treatment Duration Value.
-                step        : _duration.step    // vTreatmentRanges.heparinStopTimeRes
-                defaultValue: vTreatmentRanges.heparinStopTimeDef
+                maximum     : _duration.value   // LEAHI-SRS-300
+                step        : _duration.step    // LEAHI-SRS-300
+                defaultValue: _duration.value   // LEAHI-SRS-300
+                inActiveZero: false
                 valid       : !vTreatmentCreate.heparinStopTimeRejectReason
                 enabled         : false // this switch depends on the heparin dispencing
                 adjustable      : false // this switch depends on the heparin dispencing