Bugfix of Tokenizer