Fix calendarToWeekDate