diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index dd0c02ddbc..8e18dc7861 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -519,6 +519,10 @@ bool Foam::Time::loop()
     if (running)
     {
         operator++();
+
+        // Check update the "running" status following the "++" operation
+        // to take into account possible side-effects from functionObjects
+        running = run();
     }
 
     return running;
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 6c642dfe7b..980a308557 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -6,6 +6,7 @@ wmake libso field
 wmake libso forces
 wmake libso IO
 wmake libso utilities
+wmake libso residualControl
 wmake libso systemCall
 
 # ----------------------------------------------------------------- end-of-file