diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index cea1127a3..55e5d9059 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.1605.0")]
-[assembly: AssemblyFileVersion("3.1.1605.0")]
+[assembly: AssemblyVersion("3.1.1606.0")]
+[assembly: AssemblyFileVersion("3.1.1606.0")]
diff --git a/TBF/Rig/BuiltIn/PumpTandem/Pump.cs b/TBF/Rig/BuiltIn/PumpTandem/Pump.cs
index cea41153b..e00f51a13 100644
--- a/TBF/Rig/BuiltIn/PumpTandem/Pump.cs
+++ b/TBF/Rig/BuiltIn/PumpTandem/Pump.cs
@@ -53,22 +53,22 @@ namespace TBF.Rig.BuiltIn.PumpTandem
 		{
             pumpCfg = cfg as PumpCfg;
 
-			pump1 = (GenericDevices.IPump)TbfComponents.FindComponent(pumpCfg.Pump1, components);
+            pump1 = TbfComponents.FindComponent(pumpCfg.Pump1, components) as GenericDevices.IPump;
             if (pump1 == null) throw new Exception("Cannot find component Pump 1");
 
-			pump2 = (GenericDevices.IPump)TbfComponents.FindComponent(pumpCfg.Pump2, components);
+            pump2 = TbfComponents.FindComponent(pumpCfg.Pump2, components) as GenericDevices.IPump;
             if (pump2 == null) throw new Exception("Cannot find component Pump 2");
 
 			pumpFm1 = pump1 as GenericDevices.IPumpFM;
 			pumpFm2 = pump2 as GenericDevices.IPumpFM;
 
-            if (pump1 is BuiltIn.Pump.Pump) { mask1 = (pump1 as BuiltIn.Pump.Pump).Mask; }
-			else if (pump1 is Danfoss.VLT2800.Pump) { mask1 = (pump1 as Danfoss.VLT2800.Pump).Mask; }
+            if (pump1 is BuiltIn.Pump.Pump)                  { mask1 = (pump1 as BuiltIn.Pump.Pump).Mask; }
+			else if (pump1 is Danfoss.VLT2800.Pump)          { mask1 = (pump1 as Danfoss.VLT2800.Pump).Mask; }
             else if (pump1 is Modbus.PumpFM.DanfossVLT.Pump) { mask1 = (pump1 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
             else { mask1 = 0; }
 
-            if (pump2 is BuiltIn.Pump.Pump) { mask2 = (pump2 as BuiltIn.Pump.Pump).Mask; }
-            else if (pump2 is Danfoss.VLT2800.Pump) { mask2 = (pump2 as Danfoss.VLT2800.Pump).Mask; }
+            if (pump2 is BuiltIn.Pump.Pump)                  { mask2 = (pump2 as BuiltIn.Pump.Pump).Mask; }
+            else if (pump2 is Danfoss.VLT2800.Pump)          { mask2 = (pump2 as Danfoss.VLT2800.Pump).Mask; }
             else if (pump2 is Modbus.PumpFM.DanfossVLT.Pump) { mask2 = (pump2 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
             else { mask2 = 0; }
 
@@ -157,6 +157,7 @@ namespace TBF.Rig.BuiltIn.PumpTandem
                 case CurrentOp.TurnOn:
 					TurnOn(powerForOp);
 					return;
+
 				case CurrentOp.TurnOff:
 				default:
                     TurnOff();