diff --git a/ChangeLog b/ChangeLog
index cfab44ca3..03a22ba8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-16  Douglas S. Blank  <dblank@cs.brynmawr.edu>
+	* src/plugins/Calendar.py: fixed MenuOption's EnumeratedList to match 
+	Brian's changes on 2007-12-15.
+
 2007-12-16  Douglas S. Blank  <dblank@cs.brynmawr.edu>
 	* src/DbManager.py: typo %{}s -> %()s; fixed rcs -q issue
 	* src/Utils.py: typo %{}s -> %()s 
diff --git a/src/plugins/Calendar.py b/src/plugins/Calendar.py
index 24b5b54e8..dacd17634 100644
--- a/src/plugins/Calendar.py
+++ b/src/plugins/Calendar.py
@@ -132,11 +132,11 @@ class Calendar(Report):
         else:
             self.relationships = False
         self.year = options_class.handler.options_dict['year']
-        self.name_format = options_class.handler.options_dict['name_format'][0]
+        self.name_format = options_class.handler.options_dict['name_format']
         self.country = options_class.handler.options_dict['country']
         self.anniversaries = options_class.handler.options_dict['anniversaries']
-        self.start_dow = options_class.handler.options_dict['start_dow'][0]
-        self.maiden_name = options_class.handler.options_dict['maiden_name'][0]
+        self.start_dow = options_class.handler.options_dict['start_dow']
+        self.maiden_name = options_class.handler.options_dict['maiden_name']
         self.alive = options_class.handler.options_dict['alive']
         self.birthdays = options_class.handler.options_dict['birthdays']
         self.text1 = options_class.handler.options_dict['text1']
@@ -212,9 +212,8 @@ class Calendar(Report):
         self.progress = ProgressMeter(_('Calendar'))
         self.calendar = {}
         # get the information, first from holidays:
-        country, country_name = self.country
-        if country != 0: # Don't include holidays
-            self.get_holidays(self.year, _countries[country]) # _country is currently global
+        if self.country != 0: # Don't include holidays
+            self.get_holidays(self.year, _countries[self.country]) # _countries is currently global
         # get data from database:
         self.collect_data()
         # generate the report:
@@ -412,9 +411,8 @@ class CalendarReport(Calendar):
         self.progress = ProgressMeter(_('Birthday and Anniversary Report'))
         self.calendar = {}
         # get the information, first from holidays:
-        country, country_name = self.country
-        if country != 0:
-            self.get_holidays(self.year, _countries[country]) # currently global
+        if self.country != 0:
+            self.get_holidays(self.year, _countries[self.country]) # _countries currently global
         # get data from database:
         self.collect_data()
         # generate the report: