Fixing tokenizer, then parser