diff --git a/src/intel/decoder/intel_batch_decoder.c b/src/intel/decoder/intel_batch_decoder.c
index 55c63422277..fcd93c72b03 100644
--- a/src/intel/decoder/intel_batch_decoder.c
+++ b/src/intel/decoder/intel_batch_decoder.c
@@ -504,7 +504,11 @@ handle_compute_walker(struct intel_batch_decode_ctx *ctx,
    struct intel_field_iterator iter;
    intel_field_iterator_init(&iter, inst, p, 0, false);
    while (intel_field_iterator_next(&iter)) {
-      if (strcmp(iter.name, "Interface Descriptor") == 0) {
+      if (strcmp(iter.name, "body") == 0) {
+         intel_field_iterator_init(&iter, iter.struct_desc,
+                                   &iter.p[iter.start_bit / 32],
+                                   0, false);
+      } else if (strcmp(iter.name, "Interface Descriptor") == 0) {
          handle_interface_descriptor_data(ctx, iter.struct_desc,
                                           &iter.p[iter.start_bit / 32]);
       }