Fixed tokenizer, I think