Fixing the calendar