Fix bug with ' token during parsing