diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 4e5ba23a4..5e14c40e1 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.1835.0")]
-[assembly: AssemblyFileVersion("3.1.1835.0")]
+[assembly: AssemblyVersion("3.1.1836.0")]
+[assembly: AssemblyFileVersion("3.1.1836.0")]
diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
index 8e5ddec49..6032da078 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
@@ -1059,10 +1059,9 @@ namespace TBF.Rig.TestMethods.S640Communication
                         else if (activity == S640Activity.End)
                         {
 #if ORACLE_DB
-                            file.WriteLine(string.Format("    <Meter RadioAddress=\"{0}\" MeterNumber=\"{1}\" CustomerText=\"{2}\" NewRadioAddress=\"{3}\" PCBNumber=\"{4}\" EncyptionKey=\"\" />",
+                            file.WriteLine(string.Format("    <Meter RadioAddress=\"{0}\" MeterNumber=\"{1}\" CustomerText=\"\" NewRadioAddress=\"{2}\" PCBNumber=\"{3}\" EncyptionKey=\"\" />",
                                                          wm.OriRadioAddress,
                                                          wm.AssignedSerialNr.ToString(),
-                                                         wm.AssignedSerialNr.ToString(),
                                                          wm.RadioAddress,
                                                          wm.SerialNrAux));
 #endif
@@ -1072,7 +1071,7 @@ namespace TBF.Rig.TestMethods.S640Communication
                 file.WriteLine("  </Meters>");
                 file.WriteLine(string.Format("  <Metro Enable=\"{0}\" PulseRatePiston=\"{1}\" PulseRateLED=\"{2}\" OffsetFactor=\"{3}\" FactoryCalibration=\"{4}\" Units=\"{5}\" MeterSize=\"{6}\" OffsetTime=\"{7}\" />",
                     B2S(pPars.MetroEnable),
-                    pPars.PulseRatePiston.ToString("F3", CultureInfo.InvariantCulture),
+                    pPars.PulseRatePiston.ToString("F12", CultureInfo.InvariantCulture),
                     pPars.PulseRateLed.ToString(CultureInfo.InvariantCulture),
                     pPars.OffsetFactor.ToString(CultureInfo.InvariantCulture),
                     pPars.FactoryCalibration,