diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js
index d860783f..1656d0b0 100644
--- a/src/kiri-mode/cam/ops.js
+++ b/src/kiri-mode/cam/ops.js
@@ -66,9 +66,11 @@ class OpLaserOff extends CamOp {
     }
 
     prepare(ops, progress) {
+        const { printPoint, zmax, camOut } = ops;
         this.op.silent = true;
         ops.addGCode(this.op.disable);
         ops.setLasering(false);
+        camOut(printPoint.clone().setZ(zmax), 0);
     }
 }
 
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js
index fddebebd..1ac7056e 100644
--- a/src/kiri-mode/cam/prepare.js
+++ b/src/kiri-mode/cam/prepare.js
@@ -150,7 +150,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
     }
 
     function setPrintPoint(point) {
-        printPoint = point;
+        ops.printPoint = printPoint = point;
     }
 
     function setSpindle(speed) {
@@ -272,7 +272,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
                 }
             }
             if (lasering.flat) {
-                point.z = lasering.flatz;
+                point.z = (stock && stock.z ? stock.z : wztop) + lasering.flatz;
             }
             print.addOutput(layerOut, point, power, speed, tool, 'laser');
         } else {