diff --git a/executor/src/witgen/machines/block_machine.rs b/executor/src/witgen/machines/block_machine.rs
index 866996dd7..5ac40c013 100644
--- a/executor/src/witgen/machines/block_machine.rs
+++ b/executor/src/witgen/machines/block_machine.rs
@@ -527,7 +527,7 @@ impl<'a, T: FieldElement> BlockMachine<'a, T> {
                             "End processing block machine '{}' (already solved)",
                             self.name()
                         );
-                        return Ok(result);
+                        panic!("This should not happen anymore!");
                     }
                 }
             }
diff --git a/pipeline/tests/asm.rs b/pipeline/tests/asm.rs
index a4f67c8a7..85772a950 100644
--- a/pipeline/tests/asm.rs
+++ b/pipeline/tests/asm.rs
@@ -450,9 +450,7 @@ fn permutation_to_vm() {
 }
 
 #[test]
-#[should_panic = "Verifier did not say 'PIL OK'."]
 fn permutation_to_block_to_block() {
-    // TODO: witgen issue (https://github.com/powdr-labs/powdr/issues/1385)
     let f = "asm/permutations/block_to_block.asm";
     verify_asm(f, Default::default());
     test_halo2(f, Default::default());