Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -r53eaeea39c88b1894a6b2d7b5c2733fbf037e0da -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 53eaeea39c88b1894a6b2d7b5c2733fbf037e0da)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -2159,7 +2159,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS )
+    if ( payload.index <= LAST_FP_COND_SENSOR )
     {
         // D74 is not connected to Teensy and does not have a data structure to override.
         if ( LAST_DD_COND_SENSOR != payload.index )
@@ -2198,7 +2198,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS )
+    if ( payload.index <= LAST_FP_COND_SENSOR )
     {
         // D74 is not connected to Teensy and does not have a data structure to override.
         if ( LAST_DD_COND_SENSOR != payload.index )
@@ -2238,7 +2238,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS )
+    if ( payload.index <= LAST_FP_COND_SENSOR )
     {
         // D74 is not connected to Teensy and does not have a data structure to override.
         if ( LAST_DD_COND_SENSOR != payload.index )