diff --git a/src/cli/kiri-source.json b/src/cli/kiri-source.json
index 7b0f19b7..dc95d54a 100644
--- a/src/cli/kiri-source.json
+++ b/src/cli/kiri-source.json
@@ -1,5 +1,6 @@
 [
     "main/gapp",
+    "moto/broker",
     "moto/license",
     "add/array",
     "add/class",
@@ -12,7 +13,6 @@
     "geo/base",
     "geo/bounds",
     "geo/line",
-    "geo/mesh",
     "geo/point",
     "geo/paths",
     "geo/points",
diff --git a/src/kiri-mode/cam/slicer.js b/src/kiri-mode/cam/slicer.js
index 017119f4..e64cc98f 100644
--- a/src/kiri-mode/cam/slicer.js
+++ b/src/kiri-mode/cam/slicer.js
@@ -9,7 +9,7 @@
 // dep: moto.broker
 gapp.register("kiri-mode.cam.slicer", [], (root, exports) => {
 
-const { base, kiri } = root;
+const { base, kiri, moto } = root;
 const { config, util, polygons, newOrderedLine, newPoint, newLine } = base;
 const { sliceConnect, sliceDedup } = base;
 const { newSlice } = kiri;
diff --git a/src/kiri-mode/cam/topo.js b/src/kiri-mode/cam/topo.js
index b5d9c44a..8d669010 100644
--- a/src/kiri-mode/cam/topo.js
+++ b/src/kiri-mode/cam/topo.js
@@ -7,13 +7,13 @@
 // dep: geo.point
 // dep: geo.polygon
 // dep: geo.polygons
+// dep: moto.broker
 // dep: kiri.slice
 // dep: kiri-mode.cam.driver
 // dep: kiri-mode.cam.slicer2
-// dep: moto.broker
 gapp.register("kiri-mode.cam.topo", [], (root, exports) => {
 
-const { base, kiri } = root;
+const { base, kiri, moto } = root;
 const { driver, newSlice } = kiri;
 const { CAM } = driver;
 const { polygons, newLine, newSlope, newPoint, newPolygon } = base;
diff --git a/src/kiri-mode/cam/topo4.js b/src/kiri-mode/cam/topo4.js
index 7941b00c..aa33e9dd 100644
--- a/src/kiri-mode/cam/topo4.js
+++ b/src/kiri-mode/cam/topo4.js
@@ -7,13 +7,13 @@
 // dep: geo.point
 // dep: geo.polygon
 // dep: geo.polygons
+// dep: moto.broker
 // dep: kiri.slice
 // dep: kiri-mode.cam.driver
 // dep: kiri-mode.cam.slicer2
-// dep: moto.broker
 gapp.register("kiri-mode.cam.topo", [], (root, exports) => {
 
-const { base, kiri } = root;
+const { base, kiri, moto } = root;
 const { driver, newSlice } = kiri;
 const { CAM } = driver;
 const { polygons, newPoint, newPolygon, sliceConnect } = base;
diff --git a/src/kiri-run/worker.js b/src/kiri-run/worker.js
index 65ff5614..bcf3b01e 100644
--- a/src/kiri-run/worker.js
+++ b/src/kiri-run/worker.js
@@ -29,7 +29,7 @@
 // use: kiri-mode.laser.driver
 gapp.register("kiri-run.worker", [], (root, exports) => {
 
-const { base, kiri } = root;
+const { base, kiri, moto } = root;
 const { util, polygons, wasm_ctrl } = base;
 const { codec } = kiri;
 const { time } = util;
diff --git a/src/moto/broker.js b/src/moto/broker.js
index 81b7b728..6e73a75b 100644
--- a/src/moto/broker.js
+++ b/src/moto/broker.js
@@ -100,7 +100,11 @@ class Broker {
                 }
             }
         } else if (topic.indexOf(".topic.") < 0) {
-            dbug.debug(`undelivered '${topic}'`, message);
+            if (self.dbug) {
+                self.dbug.debug(`undelivered '${topic}'`, message);
+            } else {
+                console.log(`undelivered '${topic}'`, message);
+            }
         }
         return message;
     }