Bugfix in tokenizer... again...