Fix currentCalendar