Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
===================================================================
diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r6581def57942b1c1ef56a2f2feb74559946517b9
--- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml	(.../PreTreatmentDisposablesStack.qml)	(revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml	(.../PreTreatmentDisposablesStack.qml)	(revision 6581def57942b1c1ef56a2f2feb74559946517b9)
@@ -32,6 +32,8 @@
 
     property int stackStepIndex : 3
 
+    readonly property bool hasHeparin : vTreatmentCreate.heparinBolusVolume || vTreatmentCreate.heparinDispensingRate
+
     PreTreatmentBase { id: _preTreatmentDisposablesSelfTest
         title.text              : qsTr("Disposables Self Test")
         hasTimeCircle           : true
@@ -51,11 +53,8 @@
 
     PreTreatmentBase { id: _preTreatmentDisposablesCartridgeConnetion
         function page_confirm() {
-            if( vTreatmentCreate.heparinBolusVolume ) {
-                page( _preTreatmentDisposablesHeparinSyringe        )
-            } else {
-                page( _preTreatmentDisposablesSalineBag             )
-            }
+            if ( _root.hasHeparin ) page( _preTreatmentDisposablesHeparinSyringe        )
+            else                    page( _preTreatmentDisposablesSalineBag             )
         }
 
         title.text              : qsTr("Cartridge Connection")
@@ -79,11 +78,8 @@
 
     PreTreatmentBase { id: _preTreatmentDisposablesSalineBag
         function page_back() {
-            if( vTreatmentCreate.heparinBolusVolume ) {
-                page( _preTreatmentDisposablesHeparinSyringe        )
-            } else {
-                page( _preTreatmentDisposablesCartridgeConnetion    )
-            }
+            if ( _root.hasHeparin ) page( _preTreatmentDisposablesHeparinSyringe        )
+            else                    page( _preTreatmentDisposablesCartridgeConnetion    )
         }
 
         title.text              : qsTr("Saline Bag")