diff --git a/gramps/gen/lib/citation.py b/gramps/gen/lib/citation.py
index a43a26147..7bbc9602f 100644
--- a/gramps/gen/lib/citation.py
+++ b/gramps/gen/lib/citation.py
@@ -122,7 +122,7 @@ class Citation(MediaBase, NoteBase, IndirectCitationBase,
                 "source_handle": self.source_handle,             #  5
                 "note_list": NoteBase.to_struct(self),           #  6
                 "media_list": MediaBase.to_struct(self),         #  7
-                "datamap": self.datamap,                         #  8
+                "datamap": [(key,self.datamap[key]) for key in self.datamap.keys()],#  8
                 "change": self.change,                           #  9
                 "private": self.private}                         # 10
 
diff --git a/gramps/gen/lib/src.py b/gramps/gen/lib/src.py
index cb20c6688..aff1ff763 100644
--- a/gramps/gen/lib/src.py
+++ b/gramps/gen/lib/src.py
@@ -100,7 +100,7 @@ class Source(MediaBase, NoteBase, IndirectCitationBase, PrimaryObject):
                 "media_list": MediaBase.to_struct(self), 
                 "abbrev": cuni(self.abbrev),
                 "change": self.change, 
-                "datamap": {"dict": self.datamap},
+                "datamap": [(key,self.datamap[key]) for key in self.datamap.keys()],#  8
                 "reporef_list": [rr.to_struct() for rr in self.reporef_list],
                 "private": self.private}