diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
index 07fd4d2ba..57cb72be4 100644
--- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
@@ -862,16 +862,14 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
             CommErr error = CommErr.Write;
 
 			/// Write zero Q2 correction
-			double q2CorrectionFactor = wm.Q2CorrectionFactor();
-			Byte q2CorrRFlow = (byte)((int)(q2CorrectionFactor / 2 + 0.5) & 0x000000FF);
-			Byte q2CorrLFlow = (byte)((int)(q2CorrectionFactor + 0.5) & 0x000000FF);
-			byte[] wrData = new byte[2] { q2CorrRFlow, q2CorrLFlow };
-
+            byte[] wrData = new byte[2] { 0, 0 };
+            ///
 			for (int j = 0; j < MaxCommRetries; j++)
 			{
 				if (0 == WriteRequestPort(wm.MuxBoardNr, MessageID.MetrologyMemory, Q2CorrFactorsAddr, 2, wrData, CommTimeout)) { error = CommErr.None; break; }
 			}
 
+            /// Verify the correction factors
             if (error == CommErr.None)
 			{
                 error = CommErr.Verify;
@@ -912,10 +910,11 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
             CommErr error = CommErr.Write;
 
 			/// Write Q2 corrections
-			Byte q2CorrRFlow = 0;
-			Byte q2CorrLFlow = 0;
-			byte[] wrData = new byte[2] { q2CorrRFlow, q2CorrLFlow };
-
+            double q2CorrectionFactor = wm.Q2CorrectionFactor();
+            Byte q2CorrRFlow = (byte)((int)(q2CorrectionFactor / 2 + 0.5) & 0x000000FF);
+            Byte q2CorrLFlow = (byte)((int)(q2CorrectionFactor + 0.5) & 0x000000FF);
+            byte[] wrData = new byte[2] { q2CorrRFlow, q2CorrLFlow };
+            ///
 			for (int j = 0; j < MaxCommRetries; j++)
 			{
 				if (0 == WriteRequestPort(wm.MuxBoardNr, MessageID.MetrologyMemory, Q2CorrFactorsAddr, 2, wrData, CommTimeout)) { error = CommErr.None; break; }