diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs
index c928a4c32..351619209 100644
--- a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs
@@ -7,6 +7,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using log4net;
 using TBF.Resources;
+using System.IO;
 
 namespace TBF.BenchControl.DataEntry.StandardCamera
 {
@@ -49,9 +50,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		double warningLimHi;	/// limit to display exclamation mark, typically 2x errLimHi
 
         string lastImageName;
-        Image lastImage;        /// non-zoomed image
+        Bitmap lastImage;        /// non-zoomed image
+        Bitmap zoomedImage;
         bool zoom;
-        Image zoomedImage;
 
 
 		const int TextBoxesCount = 24;
@@ -573,13 +574,23 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
                 lastImageName = string.Empty;
             }
 
-            lastImage = string.IsNullOrEmpty(lastImageName) ? new Bitmap(TBF.Properties.Resources.Empty) : Image.FromFile(lastImageName);
-            pictureBox1.Image = lastImage;
+            if (string.IsNullOrEmpty(lastImageName) || !File.Exists(lastImageName))
+            {
+                pictureBox1.Image = lastImage = new Bitmap(TBF.Properties.Resources.Empty);
+            }
+            else
+            {
+                /// Load the image in a way is does not lock the file on the disk
+                using (var tempBmp = new Bitmap(lastImageName))
+                {
+                    pictureBox1.Image = lastImage = new Bitmap(tempBmp);
+                }
+            }
             zoom = false;
         }
 
         /// <summary>
-        /// Picture zoom function
+        /// Zoom function
         /// </summary>
         private void pictureBox1_Click(object sender, EventArgs e)
         {
@@ -608,125 +619,29 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
             }
         }
 
-
-		private void startTextBox1_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox2_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox3_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox4_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox5_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox6_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox7_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox8_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox9_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox10_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox11_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox12_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox13_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox14_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox15_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox16_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox17_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox18_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox19_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox20_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox21_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox22_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox23_TextChanged(object sender, EventArgs e)
-		{
-
-		}
-
-		private void startTextBox24_TextChanged(object sender, EventArgs e)
-		{
-
-		}
+		private void startTextBox1_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox2_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox3_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox4_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox5_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox6_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox7_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox8_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox9_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox10_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox11_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox12_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox13_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox14_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox15_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox16_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox17_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox18_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox19_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox20_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox21_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox22_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox23_TextChanged(object sender, EventArgs e) { }
+		private void startTextBox24_TextChanged(object sender, EventArgs e) { }
 	}
 }
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 77a75234f..8f30ad4aa 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.17.712.1")]
-[assembly: AssemblyFileVersion("2.17.712.1")]
+[assembly: AssemblyVersion("2.17.714.1")]
+[assembly: AssemblyFileVersion("2.17.714.1")]