Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r33f89f7a3ef8ac395c7d50f43d86ff6224f6ec32 -re8195e68e1255e905ebb73e0ed061faa07ea7dc4
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 33f89f7a3ef8ac395c7d50f43d86ff6224f6ec32)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e8195e68e1255e905ebb73e0ed061faa07ea7dc4)
@@ -401,7 +401,7 @@
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
                     stopSyringePump();
-                    sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, HEPARIN_STATE_DISPENSING, HEPARIN_STATE_PAUSED );
+                    sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
                 }
                 else
                 {
@@ -521,6 +521,7 @@
     }
     if ( ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState ) || ( HEPARIN_STATE_DISPENSING == heparinDeliveryState ) )
     {
+        sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
 }
@@ -1740,7 +1741,6 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
-        sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }