Fix tokenization