diff --git a/app/assets/json/threetobus/eventsMapping.json b/app/assets/json/threetobus/eventsMapping.json
index 338aa8d..e45d0c4 100644
--- a/app/assets/json/threetobus/eventsMapping.json
+++ b/app/assets/json/threetobus/eventsMapping.json
@@ -1,6 +1,6 @@
 [
     {
-        "chan": "system:observer:subscribed[UID]:agents",
+        "chan": "system:observer:subscribed[CUID]:agents",
         "events": [
             {
                 "eventName": "move",
diff --git a/core/libs/MessageBus.js b/core/libs/MessageBus.js
index ccbae2e..f9e3ace 100755
--- a/core/libs/MessageBus.js
+++ b/core/libs/MessageBus.js
@@ -328,7 +328,7 @@ class MessageBus {
      */   
     chanMatch(myChan, targetChan) {
         targetChan = targetChan.replace(/\[UID\]/g, this.userInfo.uuid)
-        targetChan = targetChan.replace(/\[CNXID\]/g, this.cnxId)
+        targetChan = targetChan.replace(/\[CUID\]/g, this.cnxId)
         let re = new RegExp('^'+targetChan.replace(/\*/g,'(.+)')+'$','g')
         return(myChan.match(re)!=null)
     }