Calendar end date fix