CalendarController bugfix