Fixed the tokenizer for special characters