diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index df437899b..1c64bed16 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -280,7 +280,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 
 			for (int i = 0; i < Program.WMsCount; i++)
 			{
-				if (sensPath.RegisterReaders[i] != null)
+				if ((sensPath.RegisterReaders[i] != null) && (WaterMeters.Count > i) && !WaterMeters[i].Disabled)
 				{
 					tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
 					tstRslt.Meters[i].VolumeStart = 0;                                      /// liter
@@ -306,6 +306,14 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 			}
 			/// Add data - end
 
+			/// Remove diasabled watermeters
+			for (int i = Program.WMsCount; i >= 0; i--)
+			{
+				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
+				{
+					tstRslt.Meters.RemoveAt(i);
+				}
+			}
 
 			/// Update modeless dialog error information
 			Bridge.OnAdjustmentInProgress(this, new AdjustmentInProgressEventArgs(tstRslt));
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index f19ef43f4..c1df72028 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -507,26 +507,38 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 			tstRslt.TimeDivEnd5 = 0;
 			for (int i = 0; i < Program.WMsCount; i++)
 			{
-				tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
-				tstRslt.Meters[i].VolumeMeter = tstRslt.Meters[i].VolumeEnd - tstRslt.Meters[i].VolumeStart;
-                tstRslt.Meters[i].VolumeRef = tstRslt.VolumeCTV;      /// liter
-				tstRslt.Meters[i].PulsesMeter = 0;
-                tstRslt.Meters[i].PulsesMaster = tstRslt.PulsesMaster;
-				tstRslt.Meters[i].Time = cBrd.TTime;
-				if (WMPulses[i] > 0 && tstRslt.Meters[i].VolumeRef > 0)
+				if ((WaterMeters.Count > i) && !WaterMeters[i].Disabled)
 				{
-					tstRslt.Meters[i].VolumeErrorPct =
-						100 * (tstRslt.Meters[i].VolumeMeter - tstRslt.Meters[i].VolumeRef) / tstRslt.Meters[i].VolumeRef;
-					/// %
+					tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
+					tstRslt.Meters[i].VolumeMeter = tstRslt.Meters[i].VolumeEnd - tstRslt.Meters[i].VolumeStart;
+					tstRslt.Meters[i].VolumeRef = tstRslt.VolumeCTV;      /// liter
+					tstRslt.Meters[i].PulsesMeter = 0;
+					tstRslt.Meters[i].PulsesMaster = tstRslt.PulsesMaster;
+					tstRslt.Meters[i].Time = cBrd.TTime;
+					if (WMPulses[i] > 0 && tstRslt.Meters[i].VolumeRef > 0)
+					{
+						tstRslt.Meters[i].VolumeErrorPct =
+							100 * (tstRslt.Meters[i].VolumeMeter - tstRslt.Meters[i].VolumeRef) / tstRslt.Meters[i].VolumeRef;
+						/// %
+					}
+					else
+					{
+						tstRslt.Meters[i].VolumeErrorPct = -100;
+					}
+					tstRslt.Meters[i].Passed = (tstRslt.ErrLimLo <= tstRslt.Meters[i].VolumeErrorPct) && (tstRslt.Meters[i].VolumeErrorPct <= tstRslt.ErrLimHi);
 				}
-				else
-				{
-					tstRslt.Meters[i].VolumeErrorPct = -100;
-				}
-				tstRslt.Meters[i].Passed = (tstRslt.ErrLimLo <= tstRslt.Meters[i].VolumeErrorPct) && (tstRslt.Meters[i].VolumeErrorPct <= tstRslt.ErrLimHi);
 			}
 			/// Add data - end
 
+			/// Remove diasabled watermeters
+			for (int i = Program.WMsCount; i >= 0; i--)
+			{
+				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
+				{
+					tstRslt.Meters.RemoveAt(i);
+				}
+			}
+
 			AddOrOverwriteResult(tstRslt);
 
 			Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt));
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 56013891c..b1385fa34 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -249,7 +249,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 
 			for (int i = 0; i < Program.WMsCount; i++)
 			{
-				if (sensPath.RegisterReaders[i] != null)
+				if ((sensPath.RegisterReaders[i] != null) && (WaterMeters.Count > i) && !WaterMeters[i].Disabled)
 				{
 					tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
 					tstRslt.Meters[i].VolumeStart = 0;                                      /// liter
@@ -275,6 +275,15 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 			}
 			/// Add data - end
 
+			/// Remove diasabled watermeters
+			for (int i = Program.WMsCount; i >= 0; i--)
+			{
+				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
+				{
+					tstRslt.Meters.RemoveAt(i);
+				}
+			}
+
 			AddOrOverwriteResult(tstRslt);
 
 			Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt));
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index 76c442a2d..0e1d45a10 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -308,7 +308,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
                 if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
             while (!e.Contains(Event.TimerExpired));
-                
+
             LogProcessHeader(processDataLogger, "End mass");
 
             //------------------------------------------------
@@ -392,7 +392,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
 			tstRslt.TimeDivEnd5 = 0;
 			for (int i = 0; i < Program.WMsCount; i++)
 			{
-				if (sensPath.RegisterReaders[i] != null)
+				if ((sensPath.RegisterReaders[i] != null) && (WaterMeters.Count > i) && !WaterMeters[i].Disabled)
 				{
 					tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
 					tstRslt.Meters[i].VolumeStart = 0;                                      /// liter
@@ -417,6 +417,15 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
 				}
 			}
 			/// Add data - end
+			
+			/// Remove diasabled watermeters
+			for (int i = Program.WMsCount; i >= 0; i--)
+			{
+				if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
+				{
+					tstRslt.Meters.RemoveAt(i);
+				}
+			}
 
 			AddOrOverwriteResult(tstRslt);