Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r0816f5b386a59ca4f4f70a7ab1a4bcbda52c0432
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 0816f5b386a59ca4f4f70a7ab1a4bcbda52c0432)
@@ -1280,22 +1280,21 @@
 {
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_SEEK_STATE;
     BOOL stopPump = FALSE;
+    S32  pos      = getSyringePumpPosition();
+    F32  bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    F32  contRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
+    U32  preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
+    U32  setTxDur = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
+    F32  hepDurHr = ( (F32)( setTxDur - preStop ) / (F32)MIN_PER_HOUR ) - HEPARIN_BOLUS_TIME_HR;
+    F32  txVolume = bolusVol + ( hepDurHr * contRate );
+    F32  syringeVol = ( SYRINGE_PUMP_EMPTY_POS - (F32)pos ) / SYRINGE_MICRO_STEPS_PER_ML;
 
     // Handle ramp up
     rampSyringePump();
 
-    // Is plunger contact detected?
-    if ( getSyringePumpForceV() >= SYRINGE_FORCE_PLUNGER_THRESHOLD_V )
+    // Is plunger contact detected or insufficient Heparin volume detected?
+    if ( ( getSyringePumpForceV() >= SYRINGE_FORCE_PLUNGER_THRESHOLD_V ) || ( syringeVol < txVolume ) )
     {
-        S32 pos      = getSyringePumpPosition();
-        F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-        F32 contRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
-        U32 preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
-        U32 setTxDur = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
-        F32 hepDurHr = ( (F32)( setTxDur - preStop ) / (F32)MIN_PER_HOUR ) - HEPARIN_BOLUS_TIME_HR;
-        F32 txVolume = bolusVol + ( hepDurHr * contRate );
-        F32 syringeVol = ( SYRINGE_PUMP_EMPTY_POS - (F32)pos ) / SYRINGE_MICRO_STEPS_PER_ML;
-
         stopPump = TRUE;
         syringePumpPlungerFound = TRUE;
         syringePumpVolumeDelivered.data = 0.0;