diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs
index 5887f840c..b00234fd5 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.159.0")]
-[assembly: AssemblyFileVersion("2.0.159.0")]
+[assembly: AssemblyVersion("2.0.162.0")]
+[assembly: AssemblyFileVersion("2.0.162.0")]
diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs
index ad7be9660..d12fe575e 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs
@@ -10,7 +10,7 @@ using TBF.BenchControl.GenericDevices;
 
 namespace TBF.BenchControl.DataEntry.Combined
 {
-    public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
+	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasWMStatesForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
         public override string ToString() { return string.Format("DataEntry.Combined({0})", Cfg.ToString(1)); }
@@ -275,11 +275,7 @@ namespace TBF.BenchControl.DataEntry.Combined
             {
 				if (testRslt.MetersKind != MetersKind.Combined) continue;
 
-                /// Todo: Generalize !!! Now implemented for Munich = one combined meter.
-				//testRslt.Meters[0].SerialNr = waterMeters[0].SerialNr;
-				//testRslt.Meters[0].EndState = waterMeters[0].EndState;
-				//testRslt.Meters[1].SerialNr = waterMeters[1].SerialNr;
-				//testRslt.Meters[1].EndState = waterMeters[1].EndState;
+				testRslt.PurchaseOrder = PurchaseOrder;
 
 				for (int i = 0; i < testRslt.Meters.Count; i++)
 				{
diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.cs
index 5e4381a63..3a62df79b 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.cs
@@ -154,7 +154,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 			}
 			if (TextBoxesCount >= 1) groupBox1.Visible = true;
 			if (TextBoxesCount >= 2) groupBox2.Visible = true;
-			if (TextBoxesCount >= 3) groupBox2.Visible = true;
+			if (TextBoxesCount >= 3) groupBox3.Visible = true;
 
 			if (endStates)
 			{
@@ -208,7 +208,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 			Text = Strings.Water_Meter_States;
 			groupBox1.Text = Strings.Water_Meter + " 1";
 			groupBox2.Text = Strings.Water_Meter + " 2";
-			groupBox2.Text = Strings.Water_Meter + " 3";
+			groupBox3.Text = Strings.Water_Meter + " 3";
 			for (int i = 0; i < TextBoxesCount; i++)
 			{
 				mainLabels[i].Text = Strings.Main_;
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs
index fc9ef78ca..10f68acfe 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs
@@ -16,7 +16,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters
 
 		public bool Evaluate(Test test) { return true; }
 		public bool Publish(Test test) { return true; }
-		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
+		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
 
 		public TestMethod()
 		{
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 68284bc74..986bdd096 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.159.1")]
-[assembly: AssemblyFileVersion("2.0.159.1")]
+[assembly: AssemblyVersion("2.0.162.1")]
+[assembly: AssemblyFileVersion("2.0.162.1")]