diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs
index 67d1db97e..f6eff76a0 100644
--- a/Config/Properties/AssemblyInfo.cs
+++ b/Config/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.163.0")]
-[assembly: AssemblyFileVersion("2.0.163.0")]
+[assembly: AssemblyVersion("2.0.164.0")]
+[assembly: AssemblyFileVersion("2.0.164.0")]
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs
index 3921a7205..31880eb60 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs
@@ -164,14 +164,21 @@ namespace TBF.BenchControl.ResultsPrinters.LabelPrinter
 			}
 			else
 			{
-				if (!unsortedResults[0].Meters[nextWMNr].Disabled)
+                /// Skip disabled water meters
+                while ((nextWMNr < Config.Data.WMsCount) && unsortedResults[0].Meters[nextWMNr].Disabled) nextWMNr++;
+
+                if (nextWMNr < Config.Data.WMsCount)
 				{
 					PrintSingleWM(e, nextWMNr);
 
 					bool anyMore = false;
 					for (int i = nextWMNr + 1; i < Config.Data.WMsCount; i++)
 					{
-						if (!unsortedResults[0].Meters[i].Disabled) anyMore = true;
+                        if (!unsortedResults[0].Meters[i].Disabled)
+                        {
+                            anyMore = true;
+                            break;
+                        }
 					}
 					e.HasMorePages = anyMore;
 				}
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 6f8e224d4..ca82a7d54 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.0.163.1")]
-[assembly: AssemblyFileVersion("2.0.163.1")]
+[assembly: AssemblyVersion("2.0.164.1")]
+[assembly: AssemblyFileVersion("2.0.164.1")]