Fixed tokenizer, I think, take 2