Used date parsers to fix the calendar bug