Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r9bf209fc5813b7e806f51f408ece77174a336c9b -rcb832b3a86cc2a3147e8447f33fc99f34a2b0011
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9bf209fc5813b7e806f51f408ece77174a336c9b)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision cb832b3a86cc2a3147e8447f33fc99f34a2b0011)
@@ -725,7 +725,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( TRUE == isSyringePumpStopped() )
+        if ( ( isSyringePumpHome() != TRUE ) && ( TRUE == isSyringePumpStopped() ) )
         {
             retractSyringePump();
         }