fix tokenization