diff --git a/api/v2/format/master.c b/api/v2/format/master.c
index 3219055d5fcf6fafb3bf278e8670c36169dd6c96..c3caf3e6f45db9fe192a42612808a7ba141cbfa1 100644
--- a/api/v2/format/master.c
+++ b/api/v2/format/master.c
@@ -342,8 +342,8 @@ void eb_device_flush(eb_device_t devicep) {
         /* Setup a response */
         response->deadline = aux->time_cache + 5;
         response->cycle = cyclep;
-        response->write_cursor = operationp;
-        response->status_cursor = needs_check ? operationp : EB_NULL;
+        response->write_cursor = cycle->first;
+        response->status_cursor = needs_check ? cycle->first : EB_NULL;
         
         /* Claim response address */
         response->address = aux->rba;