trying to fix calender edge case?