Fixing parse issue with ISO date format