diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js
index 587c563f..30738a91 100644
--- a/src/kiri-mode/cam/ops.js
+++ b/src/kiri-mode/cam/ops.js
@@ -410,7 +410,7 @@ class OpRough extends CamOp {
         let danger = controller.danger;
         let easeDown = process.camEaseDown;
         let cutdir = process.camConventional;
-        let depthFirst = process.camDepthFirst;
+        let depthFirst = process.camDepthFirst && !state.isIndexed;
         let depthData = [];
 
         setTool(op.tool, op.rate, op.plunge);
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js
index 211de0c3..ef1b3a6e 100644
--- a/src/kiri-mode/cam/prepare.js
+++ b/src/kiri-mode/cam/prepare.js
@@ -509,7 +509,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
 
     function depthRoughPath(start, depth, levels, tops, emitter, fit, ease) {
         let level = levels[depth];
-        if (!level) {
+        if (!(level && level.length)) {
             return start;
         }
         let ltops = tops[depth];