diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 57507e48d..f7ab9a3f2 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.1854.0")]
-[assembly: AssemblyFileVersion("3.1.1854.0")]
+[assembly: AssemblyVersion("3.1.1856.0")]
+[assembly: AssemblyFileVersion("3.1.1856.0")]
diff --git a/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs b/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
index d94ea8aef..bf8451741 100644
--- a/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
+++ b/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
@@ -404,11 +404,9 @@ namespace TBF.Rig.TestMethods.StandingStart
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
 				 .EnterState();
-            do {
-                e = StateMachine.WaitRunDevsRunOps();
-                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
-            }
-            while (!e.Contains(Event.ValvesSet));
+            e = StateMachine.WaitRunDevsRunOps();
+            if (e.Contains(Event.Error))      { retVal = Event.Error;     goto stopTest; }
+            if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 
             IOperation testInProgress = cBrd.StandingStartStopTestOp(test, 2 * totalPulses, true);
             IOperation controlFlowOp = cBrd.SetFlowOp(test.Qfrom, test.Qto, RefFlow, int.MaxValue);
@@ -421,7 +419,7 @@ namespace TBF.Rig.TestMethods.StandingStart
             for (int i = 0; i < 3; i++)
             {
                 e = StateMachine.WaitRunDevsRunOps();
-                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (e.Contains(Event.Error))      { retVal = Event.Error;     goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
 
@@ -434,7 +432,7 @@ namespace TBF.Rig.TestMethods.StandingStart
             do
             {
                 e = StateMachine.WaitRunDevsRunOps();
-                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (e.Contains(Event.Error))      { retVal = Event.Error;     goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
             while (!e.Contains(Event.ValvesSet));
@@ -654,22 +652,13 @@ namespace TBF.Rig.TestMethods.StandingStart
             }
             while (e.Contains(Event.ValvesBusy));
 
-            switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
-            log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
-
-
-            State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name))
+            State.Create(string.Format("{0}({1}) : Stop flow regulation", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(cBrd.StopFlowRegulationOp())
                  .EnterState();
-            do {
-                e = StateMachine.WaitRunDevsRunOps();
-                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
-                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
-            }
-            while (!e.Contains(Event.FlowRegulationStopped));
-
+            e = StateMachine.WaitRunDevsRunOps();
+            if (e.Contains(Event.Error))      { retVal = Event.Error;     goto stopTest; }
+            if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 
             switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
             log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);