diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
index 5d68e15f5..e2ad7032f 100644
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@@ -292,6 +292,7 @@ namespace TBF.BenchControl.Sequences
                         Text5 = WaterMeters[ix].Text5,
                         
                         Compound = compound,
+                        HeatMeter = heatMeters,
 					};
 
                 if (compound)
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 33cff120e..f10494df4 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -399,11 +399,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                         Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
                         Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
 
-                        BenchControl.Elde.FixedStartRegisterReader.RegisterReader volumeRegReader =
-                            (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader : null;
+                        BenchControl.GenericDevices.IRegisterReader volumeRegReader =
+                            (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
 
-                        BenchControl.Elde.FixedStartRegisterReader.RegisterReader energyRegReader =
-                            (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader : null;
+                        BenchControl.GenericDevices.IRegisterReader energyRegReader =
+                            (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
 
                         if (volumeRslt != null && volumeRegReader != null)
                         {
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
index a34ac2a28..b93957e1f 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
@@ -670,11 +670,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                         Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
                         Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
 
-                        BenchControl.Elde.FixedStartRegisterReader.RegisterReader volumeRegReader =
-                            (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader : null;
+                        BenchControl.GenericDevices.IRegisterReader volumeRegReader =
+                            (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
 
-                        BenchControl.Elde.FixedStartRegisterReader.RegisterReader energyRegReader =
-                            (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader : null;
+                        BenchControl.GenericDevices.IRegisterReader energyRegReader =
+                            (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
 
                         if (volumeRslt != null && volumeRegReader != null)
                         {
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 5210ac8be..1d7469b83 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.357.1")]
-[assembly: AssemblyFileVersion("2.10.357.1")]
+[assembly: AssemblyVersion("2.10.358.1")]
+[assembly: AssemblyFileVersion("2.10.358.1")]
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
index 67b8ce5fb..d73d937a7 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
@@ -256,7 +256,7 @@ namespace TBF.Screens
 
 			foreach (var mtr in wMtr.MeterTestRslts)
 			{
-                if ( (mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
+                if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
                       && mtr.TestDone
                       && (mtr.Publish() != Config.Entities.Publish.Never)
 					  && (mtr.Publish() != Config.Entities.Publish.Internal))
@@ -276,7 +276,7 @@ namespace TBF.Screens
 		/// <returns>ListView object</returns>
 		ListView GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
 		{
-			metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
             ListView lview = GetListView();