Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
===================================================================
diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608
--- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(.../PreTreatmentPrimeStack.qml)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(.../PreTreatmentPrimeStack.qml)	(revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608)
@@ -99,29 +99,29 @@
     }
 
     Connections { target: vPreTreatmentStates
-        onSelfTestDryChanged                        : { if ( vselfTestDry         ) {   page( _preTreatmentDrySelfTest                          )}}
+        onSelfTestDryChanged                        : { page( _preTreatmentDrySelfTest                      , vselfTestDry                          )}
         onSelfTestDry_startChanged                  : {}
         onSelfTestDry_waitDoorCloseChanged          : {}
-        onSelfTestDry_usedCartridgeEntered          : { _preTreatmentDrySelfTest.checkList.setItem( 0, vselfTestDry_usedCartridge               )}
-        onSelfTestDry_occlusionSensorsEntered       : { _preTreatmentDrySelfTest.checkList.setItem( 1, vselfTestDry_occlusionSensors            )}
-        onSelfTestDry_pressureSensorsSetupEntered   : { _preTreatmentDrySelfTest.checkList.setItem( 2, true                                     )}
+        onSelfTestDry_usedCartridgeEntered          : { _preTreatmentDrySelfTest        .checkList.setItem(0, vselfTestDry_usedCartridge            )}
+        onSelfTestDry_occlusionSensorsEntered       : { _preTreatmentDrySelfTest        .checkList.setItem(1, vselfTestDry_occlusionSensors         )}
+        onSelfTestDry_pressureSensorsSetupEntered   : { _preTreatmentDrySelfTest        .checkList.setItem(2, true                                  )}
         onSelfTestDry_pressureSensorsEntered        : {}
-        onSelfTestDry_pressureSensorsNormalEntered  : { _preTreatmentDrySelfTest.checkList.setItem( 2, vselfTestDry_pressureSensorsNormal       )}
+        onSelfTestDry_pressureSensorsNormalEntered  : { _preTreatmentDrySelfTest        .checkList.setItem(2, vselfTestDry_pressureSensorsNormal    )}
         onSelfTestDry_stoppedEntered                : {}
         onSelfTestDry_completeEntered               : {}
     }
 
     Connections { target: vPreTreatmentStates
-        onPrimeChanged                              : { if ( vprime               ) {   page( _preTreatmentDisposablesPrime                     )}}
+        onPrimeChanged                              : { page( _preTreatmentDisposablesPrime                 , vprime                                )}
         onPrime_waitUserStartEntered                : {}
-        onPrime_salineSetupEntered                  : { _preTreatmentDisposablesPrime.checkList.setItem(0, true                                 )}
+        onPrime_salineSetupEntered                  : { _preTreatmentDisposablesPrime   .checkList.setItem(0, true                                  )}
         onPrime_salinePurgeAirEntered               : {}
-        onPrime_salineCirculateBloodCircuitEntered  : { _preTreatmentDisposablesPrime.checkList.setItem(0, vprime_salineCirculateBloodCircuit   )}
-        onPrime_reservoiOneFillCompleteEntered      : { _preTreatmentDisposablesPrime.checkList.setItem(1, true                                 )}
+        onPrime_salineCirculateBloodCircuitEntered  : { _preTreatmentDisposablesPrime   .checkList.setItem(0, vprime_salineCirculateBloodCircuit    )}
+        onPrime_reservoiOneFillCompleteEntered      : { _preTreatmentDisposablesPrime   .checkList.setItem(1, true                                  )}
         onPrime_dialysateDialyzerEntered            : {}
         onPrime_reservoirTwoFillCompleteEntered     : {}
-        onPrime_dialysateBypassEntered              : { _preTreatmentDisposablesPrime.checkList.setItem(1, vprime_dialysateBypass               )}
-        onPrime_wetSelfTestsEntered                 : { _preTreatmentDisposablesPrime.checkList.setItem(2, vprime_wetSelfTests                  )}
+        onPrime_dialysateBypassEntered              : { _preTreatmentDisposablesPrime   .checkList.setItem(1, vprime_dialysateBypass                )}
+        onPrime_wetSelfTestsEntered                 : { _preTreatmentDisposablesPrime   .checkList.setItem(2, vprime_wetSelfTests                   )}
         onPrime_pauseEntered                        : {}
         onPrime_completeEntered                     : {}
     }