diff --git a/runbot_merge/controllers/__init__.py b/runbot_merge/controllers/__init__.py
index c37b3d3f..cc0838bb 100644
--- a/runbot_merge/controllers/__init__.py
+++ b/runbot_merge/controllers/__init__.py
@@ -27,8 +27,14 @@ def staging_dict(staging):
             'repository': p.repository.name,
             'number': p.number,
         }),
-        'merged': staging.commit_ids.mapped('sha'),
-        'staged': staging.head_ids.mapped('sha'),
+        'merged': {
+            c.repository_id.name: c.commit_id.sha
+            for c in staging.commits
+        },
+        'staged': {
+            h.repository_id.name: h.commit_id.sha
+            for h in staging.heads
+        },
     }
 
 class MergebotController(Controller):