fix retokenization