Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r6bccc0b74d3d04fd702709aec11632cacdc5b98e -r949ad668942edca484bae949ec3f8fd944daff0b
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 6bccc0b74d3d04fd702709aec11632cacdc5b98e)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 949ad668942edca484bae949ec3f8fd944daff0b)
@@ -295,6 +295,7 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
     F32 calculatedConductivity = 0.0F;
+    F32 uncompenstatedConductivity = 0.0F;
     U32 activeFilterSize = getConductivityFilterSize();
     BOOL freshData = FALSE;
 
@@ -346,14 +347,14 @@
             filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, conductivityFilterSize );
             filteredcurrentConductivityReadings[ sensor ].data = filteredConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredConductivityReadings[ sensor ].conductivityReadingsCount;
 
-            if ( filteredUConductivityReadings[ sensor ].conductivityReadingsCount >= SIZE_OF_COND_ROLLING_AVG )
+            if ( filteredUConductivityReadings[ sensor ].conductivityReadingsCount >= conductivityFilterSize )
             {
                 filteredUConductivityReadings[ sensor ].conductivityReadingsTotal -= filteredUConductivityReadings[ sensor ].conductivityReadings[ filteredUConductivityReadings[ sensor ].conductivityReadingsIdx ];
             }
             filteredUConductivityReadings[ sensor ].conductivityReadings[ filteredUConductivityReadings[ sensor ].conductivityReadingsIdx ] = uncompenstatedConductivity;
             filteredUConductivityReadings[ sensor ].conductivityReadingsTotal += uncompenstatedConductivity;
-            filteredUConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredUConductivityReadings[ sensor ].conductivityReadingsIdx, 0, SIZE_OF_COND_ROLLING_AVG - 1 );
-            filteredUConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredUConductivityReadings[ sensor ].conductivityReadingsCount, SIZE_OF_COND_ROLLING_AVG );
+            filteredUConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredUConductivityReadings[ sensor ].conductivityReadingsIdx, 0, conductivityFilterSize - 1 );
+            filteredUConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredUConductivityReadings[ sensor ].conductivityReadingsCount, conductivityFilterSize );
             filteredcurrentUConductivityReadings[ sensor ].data = filteredUConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredUConductivityReadings[ sensor ].conductivityReadingsCount;
 
         }