diff --git a/TestBenchFramework/BenchControl/Operations/AskYesNoForm.cs b/TestBenchFramework/BenchControl/Operations/AskYesNoForm.cs
index 0d0efbcc9..c444307bc 100644
--- a/TestBenchFramework/BenchControl/Operations/AskYesNoForm.cs
+++ b/TestBenchFramework/BenchControl/Operations/AskYesNoForm.cs
@@ -10,19 +10,17 @@ namespace TBF.BenchControl.Operations
 {
 	public partial class AskYesNoForm : Form
 	{
-		public string Question;
-
 		/// One of the following two variables set to 'true' when the form closes
 		public bool CompletedYes;
 		public bool CompletedNo;
 
 
-		public AskYesNoForm()
+		public AskYesNoForm(string question)
 		{
 			InitializeComponent();
 
 			Localize();
-			questionLabel.Text = Question;
+            questionLabel.Text = question;
 
 			float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(questionLabel.Text, questionLabel.Font).Width;
 			int rqrdFormWidth = (int)textWidth + 80;	/// Form width calculated from the text width
diff --git a/TestBenchFramework/BenchControl/Operations/AskYesNoOp.cs b/TestBenchFramework/BenchControl/Operations/AskYesNoOp.cs
index 63d73c5c7..589825bc4 100644
--- a/TestBenchFramework/BenchControl/Operations/AskYesNoOp.cs
+++ b/TestBenchFramework/BenchControl/Operations/AskYesNoOp.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -29,8 +29,7 @@ namespace TBF.BenchControl.Operations
         /// 
         void OpenFormDlg(AskYesNoOp myRef)
         {
-			myRef.modelessDlg = new AskYesNoForm();
-			myRef.modelessDlg.Question = this.question;
+			myRef.modelessDlg = new AskYesNoForm(question);
             modelessDlg.Show();
         }
 
diff --git a/TestBenchFramework/BenchControl/Operations/MessageBoxForm.cs b/TestBenchFramework/BenchControl/Operations/MessageBoxForm.cs
index cb64b5166..740fe7ca5 100644
--- a/TestBenchFramework/BenchControl/Operations/MessageBoxForm.cs
+++ b/TestBenchFramework/BenchControl/Operations/MessageBoxForm.cs
@@ -10,19 +10,17 @@ namespace TBF.BenchControl.Operations
 {
 	public partial class MessageBoxForm : Form, GenericDevices.IHasCompleted
 	{
-		public string Message;
-
 		/// Set to 'true' when the form closes
 		public bool Completed { get { return completed; } }
 		bool completed;
 
 
-		public MessageBoxForm()
+		public MessageBoxForm(string message)
 		{
 			InitializeComponent();
 
 			Localize();
-			messageLabel.Text = Message;
+			messageLabel.Text = message;
 
 			float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(messageLabel.Text, messageLabel.Font).Width;
 			int rqrdFormWidth = (int)textWidth + 80;	/// Form width calculated from the text width
diff --git a/TestBenchFramework/BenchControl/Operations/MessageBoxOp.cs b/TestBenchFramework/BenchControl/Operations/MessageBoxOp.cs
index 423b7864c..2d89a4bce 100644
--- a/TestBenchFramework/BenchControl/Operations/MessageBoxOp.cs
+++ b/TestBenchFramework/BenchControl/Operations/MessageBoxOp.cs
@@ -30,8 +30,7 @@ namespace TBF.BenchControl.Operations
         /// 
         void OpenFormDlg(MessageBoxOp myRef)
         {
-			myRef.modelessDlg = new MessageBoxForm();
-			myRef.modelessDlg.Message = this.message;
+			myRef.modelessDlg = new MessageBoxForm(message);
             modelessDlg.Show();
         }