diff --git a/lib/rapi/baserlib.py b/lib/rapi/baserlib.py
index ee2e9b23382112b842ce905168c5695e6b268ffd..099fab1e2f31d037c0a491416e5741312036dd1e 100644
--- a/lib/rapi/baserlib.py
+++ b/lib/rapi/baserlib.py
@@ -37,7 +37,7 @@ def BuildUriList(ids, uri_format, uri_fields=("name", "uri")):
 
   """
   (field_id, field_uri) = uri_fields
-  
+
   def _MapId(m_id):
     return { field_id: m_id, field_uri: uri_format % m_id, }
 
@@ -73,7 +73,7 @@ def MapFields(names, data):
   """
   if len(names) != len(data):
     raise AttributeError("Names and data must have the same length")
-  return dict([(names[i], data[i]) for i in range(len(names))])
+  return dict(zip(names, data))
 
 
 def _Tags_GET(kind, name=None):