Bugfix Tokenizer