diff --git a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
index 7b0760a4a..207dcef64 100644
--- a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+++ b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -1373,10 +1373,6 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 		/// <returns>Nr. of rows updated</returns>
 		int SaveMeterTestResult(OracleConnection conn, Results.Entities.MeterTestRslt mtr, int pruefungsNr, int max_Pruefindex, int wmTypeRevision)
 		{
-			double Q_wm = (mtr.TestTime != 0) ? (3600.0 * mtr.VolumeMeter / mtr.TestTime) : 0;		/// in [l/hour]
-            double Q_wm_with_upper_bound = Math.Min(2 * 1000 * mtr.TestRslt.FlowVolume, Math.Max(0.0, Q_wm));
-            int retv = 0;
-
             if (!dbCfg.TestMode)
             {
                 OracleCommand cmd = new OracleCommand("INSERT INTO vt_pruefreihe_ist_pd( vt_fernum, pruefindex, pruefungsnr, anbid," +
@@ -1391,7 +1387,9 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = mtr.WaterMeter.WaterMeterData.WMTypeId });                      /// :5  id_wztyp
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wmTypeRevision });                                              /// :6  rev_wztyp
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 1 });                                                           /// :7  rev_wzpruefpunkt
-                cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Q_wm_with_upper_bound });                                      /// :8  q_wz
+                cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = (mtr.VolumeRef > float.Epsilon)
+                                                                                                   ? 1000 * mtr.TestRslt.FlowVolume * mtr.VolumeMeter / mtr.VolumeRef
+                                                                                                   : 0 });                                                          /// :8  q_wz
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Min(100.0, Math.Max(-100.0, mtr.Error)) });               /// :9  q_fehler
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = mtr.Passed ? 1 : 0 });                                          /// :10 q_best
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 });                                                           /// :11 niz
@@ -1400,15 +1398,16 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Min(100.0, Math.Max(-100.0, mtr.KorrErrQ)) });            /// :14 korrerrq
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Min(100000, mtr.TestTime) });                             /// :15 tiz
 
-                retv = cmd.ExecuteNonQuery();
+                int retv = cmd.ExecuteNonQuery();
                 log.DebugFormat("VT_PRUEFREIHE_IST_PD inserted, PcbNr={0}, pruefungsNr={1}, error={2}", mtr.WaterMeter.SerialNr, pruefungsNr, mtr.Error);
+                return retv;
             }
             else
             {
                 log.WarnFormat("SIM: VT_PRUEFREIHE_IST_PD inserted, PcbNr={0}, pruefungsNr={1}, error={2}", mtr.WaterMeter.SerialNr, pruefungsNr, mtr.Error);
             }
 
-            return retv;
+            return 0;
         }
 #endif
     }