Fix to tokenization