Fix bug in tokenizer