don't change token type before it's actually converted

Signed-off-by: Roman Yeryomin <roman@advem.lv>