Fixed tokenize (again).