Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -rfb05e07f9ec4ba38681de2542d02d4c1f3ba9e52
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision fb05e07f9ec4ba38681de2542d02d4c1f3ba9e52)
@@ -273,17 +273,17 @@
         // Don't interrupt pump control unless rate or mode is changing
         if ( ( dirFlowRate != targetDialInFlowRate ) || ( mode != dialInPumpControlMode ) )
         {
-            BOOL byPassFlowLimit = FALSE;
+            BOOL isFlowRateInRange = ( flowRate <= MAX_DIAL_IN_FLOW_RATE ? TRUE : FALSE );
 
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS ) )
             {
-                byPassFlowLimit = TRUE;
+                isFlowRateInRange = TRUE;
             }
 #endif
 
             // Verify flow rate
-            if ( ( flowRate <= MAX_DIAL_IN_FLOW_RATE ) || ( TRUE == byPassFlowLimit ) )
+            if ( TRUE == isFlowRateInRange )
             {
                 resetDialInFlowMovingAverage();
                 targetDialInFlowRate = dirFlowRate;
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -rfb05e07f9ec4ba38681de2542d02d4c1f3ba9e52
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision fb05e07f9ec4ba38681de2542d02d4c1f3ba9e52)
@@ -1340,6 +1340,7 @@
             if ( 0 == value )
             {
                 signalDialOutPumpHardStop();
+                result = TRUE;
             }
             else
             {