Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
===================================================================
diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f
--- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml	(.../PreTreatmentDisposablesStack.qml)	(revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml	(.../PreTreatmentDisposablesStack.qml)	(revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f)
@@ -50,13 +50,21 @@
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesCartridgeConnetion
+        function page_confirm() {
+            if( vTreatmentCreate.heparinBolusVolume ) {
+                page( _preTreatmentDisposablesHeparinSyringe        )
+            } else {
+                page( _preTreatmentDisposablesSalineBag             )
+            }
+        }
+
         title.text              : qsTr("Cartridge Connection")
         header.backVisible      : true
         header.confirmVisible   : true
         header.confirmText.text : qsTr("NEXT")
         instructionBased        : true
         onBackClicked           : { page( _preTreatmentDisposablesCartridgeInstallation )}
-        onConfirmClicked        : { page( _preTreatmentDisposablesHeparinSyringe        )}
+        onConfirmClicked        : { page_confirm(                                       )}
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesHeparinSyringe
@@ -70,12 +78,20 @@
     }
 
     PreTreatmentBase { id: _preTreatmentDisposablesSalineBag
+        function page_back() {
+            if( vTreatmentCreate.heparinBolusVolume ) {
+                page( _preTreatmentDisposablesHeparinSyringe        )
+            } else {
+                page( _preTreatmentDisposablesCartridgeConnetion    )
+            }
+        }
+
         title.text              : qsTr("Saline Bag")
         header.backVisible      : true
         header.confirmVisible   : true
         header.confirmText.text : qsTr("CONFIRM")
         instructionBased        : true
-        onBackClicked           : { page( _preTreatmentDisposablesHeparinSyringe        )}
+        onBackClicked           : { page_back(                                          )}
         onConfirmClicked        : { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm()}
     }