diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs
index 31fbfff94..5a72a4883 100644
--- a/TBF/BenchControl/Sequences/MainSeq.cs
+++ b/TBF/BenchControl/Sequences/MainSeq.cs
@@ -211,22 +211,22 @@ namespace TBF.BenchControl.Sequences
             if (StateMachine.DrainValve3 != null) allDrainValves.Add(StateMachine.DrainValve3);
 
             // Determine the tank emptying time (the maximum for all balances)
-            int scaleDrainTime = 0;
-            if (StateMachine.Tank1 != null && StateMachine.Tank1.EmptyTimeSec > scaleDrainTime)
+            int maxTankDrainTime = 0;
+            if (StateMachine.Tank1 != null && StateMachine.Tank1.EmptyTimeSec > maxTankDrainTime)
             {
-                scaleDrainTime = StateMachine.Tank1.EmptyTimeSec;
+                maxTankDrainTime = StateMachine.Tank1.EmptyTimeSec;
             }
-            if (StateMachine.Tank2 != null && StateMachine.Tank2.EmptyTimeSec > scaleDrainTime)
+            if (StateMachine.Tank2 != null && StateMachine.Tank2.EmptyTimeSec > maxTankDrainTime)
             {
-                scaleDrainTime = StateMachine.Tank2.EmptyTimeSec;
+                maxTankDrainTime = StateMachine.Tank2.EmptyTimeSec;
             }
-            if (StateMachine.Tank3 != null && StateMachine.Tank3.EmptyTimeSec > scaleDrainTime)
+            if (StateMachine.Tank3 != null && StateMachine.Tank3.EmptyTimeSec > maxTankDrainTime)
             {
-                scaleDrainTime = StateMachine.Tank3.EmptyTimeSec;
+                maxTankDrainTime = StateMachine.Tank3.EmptyTimeSec;
             }
-            if (scaleDrainTime > 0)
+            if (maxTankDrainTime > 0)
             {
-                startNew.AddOperation(new TimerOp(scaleDrainTime, remainingTime))
+                startNew.AddOperation(new TimerOp(maxTankDrainTime, remainingTime))
                         .AddOperation(StateMachine.ControlBoard.SetValvesOp(allDrainValves, null));
             }
 
diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs
index 5b4352f1d..50dd12fe3 100644
--- a/TBF/BenchControl/Sequences/SequenceBase.cs
+++ b/TBF/BenchControl/Sequences/SequenceBase.cs
@@ -788,7 +788,7 @@ namespace TBF.BenchControl.Sequences
 				if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
 				if (e.Contains(Event.MeasurementCompleted) || e.Contains(Event.Next)) return Event.MeasurementCompleted;
 			}
-			while ( (realTest && !e.Contains(Event.BalanceDone)) ||
+			while ( (realTest && (outPath.Scale is IScale) && !e.Contains(Event.BalanceDone)) ||
 					!e.Contains(Event.ReadAllRegistersDone));
 
 			return Event.Done;
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
index 1aa885c0c..900285da4 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
@@ -405,7 +405,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
 				.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
-                                                      test.Qfrom, test.Qto, 2 * totalPulses, new int[] { (int)test.TolerRed, }))
+                                                      test.Qfrom, test.Qto, (totalPulses * 5 / 4), new int[] { (int)test.TolerRed, }))
                 .EnterState();
             do
             {
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index c242c64bf..3c4e30b9c 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.1044.0")]
-[assembly: AssemblyFileVersion("2.18.1044.0")]
+[assembly: AssemblyVersion("2.18.1045.0")]
+[assembly: AssemblyFileVersion("2.18.1045.0")]