diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs
index a05cb7bbe..b5f02dce5 100644
--- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs
@@ -21,6 +21,9 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		public bool ShowCycleEndForm;
         public bool SensusExtensions;
 
+        [XmlIgnore]
+        public Config.Unit Units;
+
 		/// Private parameterless constructor invoked by all other (public) constructors
 		EntryFormCfg()
         {
diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/Factory.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/Factory.cs
index b46c0b92b..8e0c4217a 100644
--- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/Factory.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/Factory.cs
@@ -23,7 +23,9 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
-			return ComponentCfgBase.CreateFromDbEntity(typeof(EntryFormCfg), component, this);
+            IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(typeof(EntryFormCfg), component, this);
+            (cfg as EntryFormCfg).Units = (cfg as EntryFormCfg).DefaultUnits;
+            return cfg;
 		}
 	}
 }
diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs
index 97b2e8617..2748b01ea 100644
--- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs
@@ -204,7 +204,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
             {
                 if (Config.Units.IsEnergy(units)) unitsComboBox.Items.Add(units.ToString());
             }
-            unitsComboBox.Text = entryFormCfg.DefaultUnits.ToString();
+            unitsComboBox.Text = entryFormCfg.Units.ToString();
 
             //Height = 115 + 90 * WaterMetersCount;
 
@@ -279,12 +279,11 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 
 		private void okButton_Click(object sender, EventArgs eArgs)
 		{
-            Config.Unit units = entryFormCfg.DefaultUnits;
             for (Config.Unit u = 0; u < Config.Unit.Count; u++)
             {
                 if (u.ToString() == unitsComboBox.Text)
                 {
-                    units = u;
+                    entryFormCfg.Units = u;
                     break;
                 }
             }
@@ -298,7 +297,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 						if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
 						{
 							WMEndState[i] = Utils.ParseUFloat(endTextBoxes[i].Text);
-							EnergyEndState[i] = Config.Units.ConvertFrom(units, Utils.ParseUFloat(energyEndTextBoxes[i].Text));
+                            EnergyEndState[i] = Config.Units.ConvertFrom(entryFormCfg.Units, Utils.ParseUFloat(energyEndTextBoxes[i].Text));
 						}
 					}
 				}
@@ -311,7 +310,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 							WMStartStateStr[i] = startTextBoxes[i].Text;
 							WMStartState[i] = Utils.ParseUFloat(startTextBoxes[i].Text);
 							EnergyStartStateStr[i] = energyStartTextBoxes[i].Text;
-							EnergyStartState[i] = Config.Units.ConvertFrom(units, Utils.ParseUFloat(energyStartTextBoxes[i].Text));
+                            EnergyStartState[i] = Config.Units.ConvertFrom(entryFormCfg.Units, Utils.ParseUFloat(energyStartTextBoxes[i].Text));
 						}
 					}
 				}
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index f745c7a76..7392d7279 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.10.341.1")]
-[assembly: AssemblyFileVersion("2.10.341.1")]
+[assembly: AssemblyVersion("2.10.342.1")]
+[assembly: AssemblyFileVersion("2.10.342.1")]