diff --git a/gramps/src/GrampsParser.py b/gramps/src/GrampsParser.py
index faaeb56c1..17fb3ad8d 100644
--- a/gramps/src/GrampsParser.py
+++ b/gramps/src/GrampsParser.py
@@ -383,10 +383,12 @@ class GrampsParser:
             d = self.address.getDateObj()
         else:
             d = self.event.getDateObj()
-        d.get_start_date().setIsoDate(attrs['start'])
-        d.get_stop_date().setIsoDate(attrs['stop'])
+
         if attrs.has_key("calendar"):
             d.set_calendar(int(attrs['calendar']))
+
+        d.get_start_date().setIsoDate(attrs['start'])
+        d.get_stop_date().setIsoDate(attrs['stop'])
         
     def start_dateval(self,attrs):
         if self.address:
@@ -394,6 +396,9 @@ class GrampsParser:
         else:
             d = self.event.getDateObj()
 
+        if attrs.has_key("calendar"):
+            d.set_calendar(int(attrs['calendar']))
+
         d.get_start_date().setIsoDate(attrs['val'])
         
         if attrs.has_key("type"):
@@ -401,8 +406,6 @@ class GrampsParser:
         else:
             d.get_start_date().getMode(None)
             
-        if attrs.has_key("calendar"):
-            d.set_calendar(int(attrs['calendar']))
 
     def start_datestr(self,attrs):
         if self.address: