Fix tokenizer