diff --git a/TestBenchFramework/BenchControl/Constants.cs b/TestBenchFramework/BenchControl/Constants.cs
index 0e2c7cdac..4ff42b7dc 100644
--- a/TestBenchFramework/BenchControl/Constants.cs
+++ b/TestBenchFramework/BenchControl/Constants.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 namespace TBF.BenchControl
 {
@@ -9,6 +9,6 @@ namespace TBF.BenchControl
         /// A fraction of the tank volume that is considered to be safe.
         /// When the estimated test end tank volume exceeds this fraction, tank emptying is forced.
         /// </summary>
-        public const float TankFullFactor = 0.9f;
+        public const float TankFullFactor = 0.95f;
     }
 }
diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
index 320686f73..f7c83393c 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
@@ -317,7 +317,10 @@ namespace TBF.BenchControl.Elde
 			/// In settings the bits of pumps should be sent as follows: P1=64, P2=65, P3=66, P4=67 and P5=68
 			/// 
 			bool bit80 = (route & (((UInt128)0x1F) << 64)) != 0;		/// true if any of bits 64 through 68 is set
-			if (bit80) route = route | (((UInt128)1) << 80);
+			if (bit80)
+				route = route | (((UInt128)1) << 80);
+			else
+				route = route & (~(((UInt128)1) << 80));
 #endif
 
 			log.InfoFormat("SendCommand(Cmd={0},Ref#={1},Route={2},TotalPls={3},MassPls={4},TM={5},filt={6},FM=[{7}{8}{9}{10}{11}{12}],Reg={13},ShrtImp={14},Stop={15})",
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 17222234f..6d207f246 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.15.625.1")]
-[assembly: AssemblyFileVersion("2.15.625.1")]
+[assembly: AssemblyVersion("2.15.626.1")]
+[assembly: AssemblyFileVersion("2.15.626.1")]