diff --git a/gramps/plugins/export/exportgedcom.py b/gramps/plugins/export/exportgedcom.py
index 7f4e95c56..036896eba 100644
--- a/gramps/plugins/export/exportgedcom.py
+++ b/gramps/plugins/export/exportgedcom.py
@@ -1314,13 +1314,13 @@ class GedcomWriter(UpdateCallback):
         
         even = None
         for srcattr in citation.get_attribute_list():
-            if srcattr.type == SrcAttributeType.EVEN_CITED:
+            if str(srcattr.type) == "EVEN":
                 even = srcattr.value
                 self._writeln(level+1, "EVEN", even)
                 break
         if even:
             for srcattr in citation.get_attribute_list():
-                if srcattr.type == SrcAttributeType.EVEN_ROLE:
+                if str(srcattr.type) == "EVEN:ROLE":
                     self._writeln(level+2, "ROLE", srcattr.value)
                     break
 
diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py
index 14d81086f..940809186 100644
--- a/gramps/plugins/lib/libgedcom.py
+++ b/gramps/plugins/lib/libgedcom.py
@@ -5986,7 +5986,7 @@ class GedcomParser(UpdateCallback):
         @type state: CurrentState
         """
         sattr = SrcAttribute()
-        sattr.set_type(SrcAttributeType.EVEN_CITED)
+        sattr.set_type("EVEN")
         sattr.set_value(line.data)
         state.citation.add_attribute(sattr)
         sub_state = CurrentState(level=state.level+1)
@@ -6005,7 +6005,7 @@ class GedcomParser(UpdateCallback):
         @type state: CurrentState
         """
         sattr = SrcAttribute()
-        sattr.set_type(SrcAttributeType.EVEN_ROLE)
+        sattr.set_type("EVEN:ROLE")
         sattr.set_value(line.data)
         state.citation.add_attribute(sattr)
 
@@ -6775,7 +6775,7 @@ class GedcomParser(UpdateCallback):
         if self.use_def_src:
             # feature request 2356: avoid genitive form
             sattr = SrcAttribute()
-            sattr.set_type(SrcAttributeType.GEN_BY)
+            sattr.set_type(_("Generated By"))
             sattr.set_value("%s %s" % (self.genby, self.genvers))
             self.def_src.add_attribute(sattr)