diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs
index a6b5fb36e..c45d59e39 100644
--- a/TBF/BenchControl/Elde/ControlComWrap.cs
+++ b/TBF/BenchControl/Elde/ControlComWrap.cs
@@ -375,10 +375,14 @@ namespace TBF.BenchControl.Elde
 #elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
                                          Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
-#elif GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200
+#elif BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200
             uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
                                          Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
+#elif GENESIS
+            uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
+            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
+                                         filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
 #elif JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100
             uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,
diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs
index d93e06a4f..6e5535424 100644
--- a/TBF/BenchControl/Sequences/MainSeq.cs
+++ b/TBF/BenchControl/Sequences/MainSeq.cs
@@ -904,9 +904,9 @@ namespace TBF.BenchControl.Sequences
 				}
 
 				/// Update format for the water mass
-				Mass.Format = outPath.Scale.Format;
-				StartMass.Format = outPath.Scale.Format;
-				EndMass.Format = outPath.Scale.Format;
+				Mass.Format = (outPath != null && outPath.Scale != null) ? outPath.Scale.Format : "F3";
+				StartMass.Format = (outPath != null && outPath.Scale != null) ? outPath.Scale.Format : "F3";
+                EndMass.Format = (outPath != null && outPath.Scale != null) ? outPath.Scale.Format : "F3";
 
 				ITestMethod testMethod = TbfComponents.FindComponent(test.Method) as ITestMethod;
 				if (testMethod != null && testMethod.CanTest(StateMachine.Procedure.MetersKind))
diff --git a/TBF/MainWnd.cs b/TBF/MainWnd.cs
index e2aea9617..7187720fd 100644
--- a/TBF/MainWnd.cs
+++ b/TBF/MainWnd.cs
@@ -322,7 +322,7 @@ namespace TBF
 		/// </summary>
 		private void MainWnd_KeyPress(object sender, KeyPressEventArgs e)
 		{
-#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT
+#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT && !GENESIS
             if (BenchControlPanel != null && BenchControlPanel.ProcessKey(e.KeyChar))
             {
                 e.Handled = true;
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index bf3405bd2..9262ea1d4 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.979.0")]
-[assembly: AssemblyFileVersion("2.18.979.0")]
+[assembly: AssemblyVersion("2.18.980.0")]
+[assembly: AssemblyFileVersion("2.18.980.0")]
diff --git a/packages/ControlBoard/Genesis/ControlComponent3U.dll b/packages/ControlBoard/Genesis/ControlComponent3U.dll
index 5df699bb9..7b8f3e712 100644
Binary files a/packages/ControlBoard/Genesis/ControlComponent3U.dll and b/packages/ControlBoard/Genesis/ControlComponent3U.dll differ