Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -re8df14d6fe4268345c29c3432be848d3886341f7 -r47c427ea722dfc4c432a7c5234db11c2671f847d
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e8df14d6fe4268345c29c3432be848d3886341f7)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 47c427ea722dfc4c432a7c5234db11c2671f847d)
@@ -398,10 +398,9 @@
             {
                 if ( HEPARIN_STATE_DISPENSING == heparinDeliveryState )
                 {
+                    stopSyringePump();
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
-                    stopSyringePump();
-                    sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, HEPARIN_STATE_DISPENSING, HEPARIN_STATE_PAUSED );
                 }
                 else
                 {
@@ -414,7 +413,6 @@
                 {
                     accepted = TRUE;
                     startHeparinContinuous();
-                    sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, HEPARIN_STATE_PAUSED, HEPARIN_STATE_DISPENSING );
                 }
                 else
                 {
@@ -521,6 +519,14 @@
     }
     if ( ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState ) || ( HEPARIN_STATE_DISPENSING == heparinDeliveryState ) )
     {
+        if ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState )
+        {
+            sendTreatmentLogEventData( HEPARIN_BOLUS_END_EVENT, syringePumpSetRate, 0.0 );
+        }
+        else
+        {
+            sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
+        }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
 }
@@ -1692,7 +1698,6 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
-        sendTreatmentLogEventData( HEPARIN_BOLUS_END_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }
 
@@ -1740,7 +1745,6 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
-        sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }