diff --git a/python/nmigen_cfu/cfu.py b/python/nmigen_cfu/cfu.py
index 14807b475..f472d1fa3 100644
--- a/python/nmigen_cfu/cfu.py
+++ b/python/nmigen_cfu/cfu.py
@@ -259,7 +259,9 @@ def check_instruction_done():
                     m.d.sync += stored_function_id.eq(
                         self.cmd_function_id[:3])
                     m.d.comb += instruction_starts[current_function_id].eq(1)
-                    check_instruction_done()
+                    m.d.sync += stored_output.eq(
+                        instruction_outputs[current_function_id])
+                    m.next = "WAIT_INSTRUCTION"
             with m.State("WAIT_INSTRUCTION"):
                 # An instruction is executing on the CFU. We're waiting until it
                 # completes.