Fixed hack to work with other calendars