diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 03da27986..786d2bd37 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.1902.0")]
-[assembly: AssemblyFileVersion("3.1.1902.0")]
+[assembly: AssemblyVersion("3.1.1903.0")]
+[assembly: AssemblyFileVersion("3.1.1903.0")]
diff --git a/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index c8d364085..4ae4d2c5c 100644
--- a/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -331,7 +331,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
                         case Event.UiCmdStop: goto stopTest;
                     }
 
-                    flowsForDetection[0] = cBrd.RefFrequency * outPath.FlowMeter.NominalFlow / 2000.0;
+                    flowsForDetection[0] = cBrd.RefFrequency * outPath.FlowMeter.NominalFlow / outPath.FlowMeter.NominalFreq;
                     double diff = RegisterReaders[Math.Max(0, test.Part - 1) * 2 + 1].WMPulses - lastWMPulses[Math.Max(0, test.Part - 1) * 2 + 1];
                     pulseFreqsForDetection[0] = diff / (double)(StateMachine.Time - lastTime);
                     lastTime = StateMachine.Time;
diff --git a/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs
index 73eed3e6c..c2608a32a 100644
--- a/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs
+++ b/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs
@@ -274,7 +274,7 @@ namespace TBF.Rig.TestMethods.SensitivityTest
                     }
 
                     /// TODO: !!! The following can only be done for compound meters
-                    flowsForDetection[0] = cBrd.RefFrequency * outPath.FlowMeter.NominalFlow / 2000.0f;
+                    flowsForDetection[0] = cBrd.RefFrequency * outPath.FlowMeter.NominalFlow / outPath.FlowMeter.NominalFreq;
                     for (int i = 0; i < Data.WMsCount; i++)
                     {
                         double diff = (RegisterReaders[i] != null) ? (RegisterReaders[i].WMPulses - lastWMPulses[i]) : 0;
diff --git a/TBF/Rig/Uni/FlowMeter/FlowMeterCfg.cs b/TBF/Rig/Uni/FlowMeter/FlowMeterCfg.cs
index 6f7b0c28c..3ef7c9ab5 100644
--- a/TBF/Rig/Uni/FlowMeter/FlowMeterCfg.cs
+++ b/TBF/Rig/Uni/FlowMeter/FlowMeterCfg.cs
@@ -30,7 +30,7 @@ namespace TBF.Rig.Uni.FlowMeter
 		///
 		public int Idx1;                            /// 0   /// 1..7, (DEWA300 : I1+I2=48, I1+I3=80, I2_I3=96, I1+I2+I3=112)
         public double NominalFlow;                  /// 1   /// Nominal flow in m3/h at nominal output frequency (typ. 2000 Hz)
-        public double NominalFreq;                  /// 2   /// Nominal flow in m3/h at nominal output frequency (typ. 2000 Hz)
+        public double NominalFreq;                  /// 2   /// Nominal frequency in Hz (typ. 2000 Hz)
         public string MsrdFormat { get; set; }      /// 3
         public Unit MsrdUnit { get; set; }          /// 4
         public Unit TempUnit;                       /// 5
diff --git a/TBF/Rig/Uni/RegValve/SetFlowOp.cs b/TBF/Rig/Uni/RegValve/SetFlowOp.cs
index 8dc359cee..217acf5df 100644
--- a/TBF/Rig/Uni/RegValve/SetFlowOp.cs
+++ b/TBF/Rig/Uni/RegValve/SetFlowOp.cs
@@ -228,8 +228,8 @@ namespace TBF.Rig.Uni.RegValve
 
                 if (StateMachine.Time > setFlowTime)
                 {
-                    uniCB.SetFlow(false, regV.Idx1, 2000 * currentReqFlowLo / flowMeter.NominalFlow,
-                                                    2000 * currentReqFlowHi / flowMeter.NominalFlow);
+                    uniCB.SetFlow(false, regV.Idx1, flowMeter.NominalFreq * currentReqFlowLo / flowMeter.NominalFlow,
+                                                    flowMeter.NominalFreq * currentReqFlowHi / flowMeter.NominalFlow);
 
                     log.InfoFormat("Run(): rv#={0} TARGET: flowLo={1} flowHi={2}", regV.Idx1, currentReqFlowLo, currentReqFlowHi);
 
diff --git a/TBF/Rig/Uni/RegValveAnalog/SetFlowOp.cs b/TBF/Rig/Uni/RegValveAnalog/SetFlowOp.cs
index 8a6186cf0..275bc6c04 100644
--- a/TBF/Rig/Uni/RegValveAnalog/SetFlowOp.cs
+++ b/TBF/Rig/Uni/RegValveAnalog/SetFlowOp.cs
@@ -169,7 +169,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
             ///
             if (flowMtrFreq != 0)
             {
-                double flow = flowMtrFreq * nominalFlow / 2000.0;
+                double flow = flowMtrFreq * nominalFlow / 2000.0;       /// TODO: ???
                 if (measuredFlow != null) measuredFlow.Val = flow;
                 if (flow >= reqFlowAve) currentReqFlowLo = finalReqFlowLo;
                 if (flow <= reqFlowAve) currentReqFlowHi = finalReqFlowHi;
diff --git a/TBF/Rig/Uni/RegValveTandem/SetFlowOp.cs b/TBF/Rig/Uni/RegValveTandem/SetFlowOp.cs
index d642a6aa6..3a9d8878b 100644
--- a/TBF/Rig/Uni/RegValveTandem/SetFlowOp.cs
+++ b/TBF/Rig/Uni/RegValveTandem/SetFlowOp.cs
@@ -173,7 +173,7 @@ namespace TBF.Rig.Uni.RegValveTandem
             ///
             if (flowMtrFreq != 0)
             {
-                double flow = flowMtrFreq * nominalFlow / 2000.0;
+                double flow = flowMtrFreq * nominalFlow / 2000.0;   /// TODO: ???
                 if (measuredFlow != null) measuredFlow.Val = flow;
                 if (flow >= reqFlowAve) currentReqFlowLo = finalReqFlowLo;
                 if (flow <= reqFlowAve) currentReqFlowHi = finalReqFlowHi;