calendar-end fix