Fix issue with closed dates