Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6b13bb16465fb2eee853288fe0d109223d978cdd -r656f3ada9ab5dff1d6c377d237e799f3ab5ba7c3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6b13bb16465fb2eee853288fe0d109223d978cdd)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 656f3ada9ab5dff1d6c377d237e799f3ab5ba7c3)
@@ -556,14 +556,15 @@
 void handleDGSendConcentrateMixingRatios( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-
-    DG_ACID_CONCENTRATES_RECORD_T acid     = getAcidConcentrateCalRecord();
-    DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
+    DG_ACID_CONCENTRATES_RECORD_T acid;
+    DG_BICARB_CONCENTRATES_RECORD_T bicarb;
     // By the time these are requested, the prepare time is no longer needed since the concentrate lines are
     // primed before the actual treatment starts
-    U32 fillPrepTimeMS                     = 0;
+    U32 fillPrepTimeMS = 0;
+    U08 *payloadPtr    = msg.payload;
 
-    U08 *payloadPtr = msg.payload;
+    getAcidConcentrateCalRecord( &acid );
+    getBicarbConcentrateCalRecord( &bicarb );
 
     // Create a message record
     blankMessage( &msg );