Fix calendarController