Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r4eab0a5086a5fddeea6cbdf3f79ce1067851b4be -rc28fa96d9ed38b8bfa793eb9096e32967e2e40cb
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4eab0a5086a5fddeea6cbdf3f79ce1067851b4be)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c28fa96d9ed38b8bfa793eb9096e32967e2e40cb)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Feb-2023
+* @date    (last)      07-Feb-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -540,9 +540,9 @@
 
     if ( TRUE == didTimeout( flushBubblesStartTime, FLUSH_BUBBLES_PUMP_TIME_OUT_MS ) )
     {
-        if ( pumpSpeedIndex < RO_PUMP_LOOKUP_TABLE_SIZE )
+        if ( pumpSpeedIndex < RO_PUMP_LOOKUP_TABLE_SIZE - 1 )
         {
-            setROPumpTargetFlowRateLPM( RO_PUMP_FLUSH_BUBBLES_FLOWS[ pumpSpeedIndex++ ] / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( RO_PUMP_FLUSH_BUBBLES_FLOWS[ ++pumpSpeedIndex ] / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
             flushBubblesStartTime = getMSTimerCount();
         }
         else