Index: firmware/App/Drivers/FluidPump.c
===================================================================
diff -u -r60693bf21a8a0277eae54cbfcb6cfd68176b079a -r0e4bb73e37fea7102ede86938c597b95bae577b7
--- firmware/App/Drivers/FluidPump.c	(.../FluidPump.c)	(revision 60693bf21a8a0277eae54cbfcb6cfd68176b079a)
+++ firmware/App/Drivers/FluidPump.c	(.../FluidPump.c)	(revision 0e4bb73e37fea7102ede86938c597b95bae577b7)
@@ -119,9 +119,9 @@
         {
             fluidPumpReadDutyCycle[ pump ].data = getFPGAP40PumpPWM();
             p40RPMCnts = (U32)getFPGAP40PumpRPMCount();
-            if ( ( p40RPMCnts != 0 )  )
+            if ( ( p40RPMCnts != 0 ) && ( p40RPMCnts < FLUID_PUMP_COUNTS_FOR_STOPPED_PUMP ) )
             {
-                fluidPumpMeasRPM[ pump ].data = FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR / ((F32)( p40RPMCnts * TEN_US_IN_SECONDS ));
+                fluidPumpMeasRPM[ pump ].data =  ( FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR / ( p40RPMCnts * US_IN_SECONDS ));
             }
             else
             {