Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rb4bc2e0337b358ee180650101d98e18346bf7c22 -r4d94719436e8a8822198067f59147e3e024ac42c
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision b4bc2e0337b358ee180650101d98e18346bf7c22)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 4d94719436e8a8822198067f59147e3e024ac42c)
@@ -304,7 +304,7 @@
 
     if ( MODE_TREA == getCurrentOperationMode() )
     {
-        if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( DIALYSIS_SALINE_BOLUS_STATE != getDialysisState() ) )
+        if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
         {
             if ( HEPARIN_CMD_PAUSE == cmd )
             {
@@ -429,7 +429,7 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( HEPARIN_STATE_OFF != heparinDeliveryState ) )
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
         syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
         syringePumpRetractRequested = TRUE;
@@ -448,7 +448,7 @@
 BOOL seekSyringePlunger( void )
 {
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( TRUE == isSyringeDetected() ) &&
-         ( TRUE == syringePumpPositionKnown ) && ( HEPARIN_STATE_OFF != heparinDeliveryState ) )
+         ( TRUE == syringePumpPositionKnown ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
         syringePumpSetRate = SYRINGE_PUMP_SEEK_RATE;
         syringePumpSeekRequested = TRUE;