Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rc8da2f1848da1dfb3ca1c4f2bb453a1f7d149b2e -re6e0e56ed9769723d5e4a561a9dfe4b16ad058e6
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c8da2f1848da1dfb3ca1c4f2bb453a1f7d149b2e)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e6e0e56ed9769723d5e4a561a9dfe4b16ad058e6)
@@ -483,11 +483,14 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
-    {
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    {
+        heparinDeliveryState = HEPARIN_STATE_OFF;
+    }
 #endif
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
+    {
         {
             heparinDeliveryState = HEPARIN_STATE_STOPPED;
             if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )