Fixed bug with MakeCalendar