diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1a02aefe26..792b8089f6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.7.0e"
+__version__ = "0.7.0f"
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 4cd795e202..3aecc1ca51 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -879,7 +879,7 @@ class FederationHandler(BaseHandler):
                 })
 
                 new_state, prev_state = self.state_handler.resolve_events(
-                    [local_view, remote_view],
+                    [local_view.values(), remote_view.values()],
                     event
                 )