Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc7accd06c36151ab8664897bfa6a877f223bb27a -rd6f94761006b86d675912899f13dad0ab41578ff
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c7accd06c36151ab8664897bfa6a877f223bb27a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d6f94761006b86d675912899f13dad0ab41578ff)
@@ -3362,11 +3362,13 @@
 
     if ( 0 == message->hdr.payloadLen )
     {
+        U32 lastServiceEpochDate   = service.lastServiceEpochDate;
+        U32 serviceIntervalSeconds = ( 0 == service.lastServiceEpochDate ? 0 : service.serviceIntervalSeconds );
+
         // Fill message payload
-        memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
+        memcpy( payloadPtr, &lastServiceEpochDate, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
-        service.serviceIntervalSeconds = ( 0 == service.lastServiceEpochDate ? 0 : service.serviceIntervalSeconds );
-        memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
+        memcpy( payloadPtr, &serviceIntervalSeconds, sizeof( U32 ) );
     }
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer