diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index c25330fbd..8ffa2143a 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.1640.0")]
-[assembly: AssemblyFileVersion("3.1.1640.0")]
+[assembly: AssemblyVersion("3.1.1641.0")]
+[assembly: AssemblyFileVersion("3.1.1641.0")]
diff --git a/TBF/Rig/ControlBoard/Uni/UniCB.cs b/TBF/Rig/ControlBoard/Uni/UniCB.cs
index 50e1c8f33..d5e71a639 100644
--- a/TBF/Rig/ControlBoard/Uni/UniCB.cs
+++ b/TBF/Rig/ControlBoard/Uni/UniCB.cs
@@ -195,8 +195,9 @@ namespace TBF.Rig.ControlBoard.Uni
             scopeAnalyzerData = null;
             switchCounterData = null;
 
-            routeMask = 0xFF00FFFFFF;
-            for (int i = 0; i < cbCfg.RegValvesCount; i++) routeMask &= ~((UInt128)3 << 2 * i);
+            routeMask = 0xFF1EFFFF00;
+            for (int i = 4; i < cbCfg.RegValvesCount; i++) routeMask &= ~((UInt128)3 << 2 * i);
+            for (int i = 1; i < cbCfg.DivertersCount; i++) routeMask &= ~((UInt128)1 << 24 + i);
             if (cbCfg.RelaysFInstalled) routeMask |= 0xFF0000000000;
             if (cbCfg.RelaysGInstalled) routeMask |= 0xFF000000000000;
             if (cbCfg.RelaysHInstalled) routeMask |= 0xFF00000000000000;