diff --git a/mods/bambu/init.js b/mods/bambu/init.js
index dc77052c..27d32ce5 100644
--- a/mods/bambu/init.js
+++ b/mods/bambu/init.js
@@ -10,7 +10,7 @@ module.exports = async (server) => {
     const mcache = {};
     const wsopen = [];
     const found = {};
-    const debug = true;
+    const debug = false;
 
     class MQTT {
         #timer;
diff --git a/src/kiri-mode/cam/export.js b/src/kiri-mode/cam/export.js
index 80cbf67f..09af6838 100644
--- a/src/kiri-mode/cam/export.js
+++ b/src/kiri-mode/cam/export.js
@@ -198,10 +198,14 @@ CAM.export = function(print, online) {
             }
         }
 
+        // enforce XY origin at start of print
+        if (points === 0 || changeTool) {
+            pos.x = pos.y = pos.z = 0;
+        }
+
         // split first move to X,Y then Z for that new location
         // safety to prevent tool crashing
-        if (points === 0) {
-            pos.x = pos.y = pos.z = 0;
+        if (points === 0 || changeTool) {
             points++;
             if (spro.camFirstZMax) {
                 moveTo({