Fixed bug with tokenizer