Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -rbe4507c7fef6c9d987eba9e34369402e989e962e
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision be4507c7fef6c9d987eba9e34369402e989e962e)
@@ -244,10 +244,10 @@
     BOOL calStatus            = FALSE;
 
     calStatus |= getNVRecord2Driver( GET_CAL_ACID_CONCENTREATES, (U08*)&acidConcentrateCalRecord, sizeof( acidConcentrateCalRecord ),
-                                     ( CAL_DATA_ACID_CONCENTRATE_1 + 1 ), ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
+                                     NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
 
     calStatus |= getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ),
-                                     ( CAL_DATA_BICARB_CONCENTRATE_1 + 1 ), ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
+                                     NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {