fixed tokenizer problem