tokenizer fix