tokenization fix