Fix issue with calendar day