diff --git a/dvmconsole/MainWindow.xaml.cs b/dvmconsole/MainWindow.xaml.cs
index 2b2676a..d23513a 100644
--- a/dvmconsole/MainWindow.xaml.cs
+++ b/dvmconsole/MainWindow.xaml.cs
@@ -604,7 +604,7 @@ namespace dvmconsole
             if (pageWindow.ShowDialog() == true)
             {
                 PeerSystem handler = fneSystemManager.GetFneSystem(pageWindow.RadioSystem.Name);
-                IOSP_EXT_FNCT extFunc = new IOSP_EXT_FNCT((ushort)ExtendedFunction.INHIBIT, uint.Parse(pageWindow.RadioSystem.Rid), uint.Parse(pageWindow.DstId));
+                IOSP_EXT_FNCT extFunc = new IOSP_EXT_FNCT((ushort)ExtendedFunction.INHIBIT, P25Defines.WUID_FNE, uint.Parse(pageWindow.DstId));
 
                 RemoteCallData callData = new RemoteCallData
                 {
@@ -635,7 +635,7 @@ namespace dvmconsole
             if (pageWindow.ShowDialog() == true)
             {
                 PeerSystem handler = fneSystemManager.GetFneSystem(pageWindow.RadioSystem.Name);
-                IOSP_EXT_FNCT extFunc = new IOSP_EXT_FNCT((ushort)ExtendedFunction.UNINHIBIT, uint.Parse(pageWindow.RadioSystem.Rid), uint.Parse(pageWindow.DstId));
+                IOSP_EXT_FNCT extFunc = new IOSP_EXT_FNCT((ushort)ExtendedFunction.UNINHIBIT, P25Defines.WUID_FNE, uint.Parse(pageWindow.DstId));
 
                 RemoteCallData callData = new RemoteCallData
                 {
diff --git a/fnecore b/fnecore
index b95b6a5..6fa6c22 160000
--- a/fnecore
+++ b/fnecore
@@ -1 +1 @@
-Subproject commit b95b6a5cbed785bf6c08cb631e0cf2de39a8c8fa
+Subproject commit 6fa6c22136d0c00cb7b295a5bcbd54f416168475