--- a/app/soc/logic/models/base.py	Sat Oct 18 21:55:38 2008 +0000
+++ b/app/soc/logic/models/base.py	Sun Oct 19 00:34:33 2008 +0000
@@ -126,11 +126,10 @@
     """
 
     key_fields = {}
-    keys = fields.keys()
 
-    for key in keys[:]:
+    for key, value in fields.iteritems():
       if key in self._model.key_fields:
-        key_fields[key] = fields[key]
+        key_fields[key] = value
 
     return key_fields