Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r53ec19e12772f2a73190323438106dc93e4a12df -r7d2122a9a4330ebc2ff4c22be36f32e9a82417ec
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 53ec19e12772f2a73190323438106dc93e4a12df)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 7d2122a9a4330ebc2ff4c22be36f32e9a82417ec)
@@ -20,6 +20,7 @@
 //  Qml
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 import "qrc:/dialogs"
 import "qrc:/pages/pretreatment"
 
@@ -256,7 +257,10 @@
                     maximum         : vTreatmentRanges.treatmentDurationMax
                     step            : vTreatmentRanges.treatmentDurationRes
                     defaultValue    : vTreatmentRanges.treatmentDurationDef
-                    onValueChanged  : vTreatmentCreate.treatmentDuration = value
+                    onValueChanged  : {
+                        vTreatmentCreate.treatmentDuration = value
+                        if (_heparinStopTimeControl.value > value) { _heparinStopTimeControl.value = value }
+                    }
                 }
             }
 
@@ -300,9 +304,9 @@
                 contentItem : ValueControl { id: _heparinStopTimeControl
                     editable        : _root.editingEnabled
                     minimum         : vTreatmentRanges.heparinStopTimeMin
-                    maximum         : vTreatmentRanges.heparinStopTimeMax
-                    step            : vTreatmentRanges.heparinStopTimeRes
-                    defaultValue    : vTreatmentRanges.heparinStopTimeDef
+                    maximum         : _durationControl.value
+                    step            : _durationControl.step
+                    defaultValue    : _durationControl.value
                     onValueChanged  : vTreatmentCreate.heparinStopTime = value
                 }
             }