Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf487bb5f87d2e09a94f0a609552f1c93d1efb684 -rc27b1788cee92bcb143d6c4f09d4b278ddded36f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f487bb5f87d2e09a94f0a609552f1c93d1efb684)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c27b1788cee92bcb143d6c4f09d4b278ddded36f)
@@ -8970,20 +8970,20 @@
  *************************************************************************/
 void handleBloodLeakZeroingIntervalInMinutesOverride( MESSAGE_T* message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetBloodLeakZeroingIntervalInMinsOverride( payload.state.u32 );
+            result = testSetBloodLeakZeroingIntervalInMinsOverride( payload.index, payload.state.u32 );
         }
         else
         {
-            result = testResetBloodLeakZeroingIntervalInMinsOverride();
+            result = testResetBloodLeakZeroingIntervalInMinsOverride( payload.index );
         }
     }