bug fix - detok token track in wrong order