Tokenizer bug fix.