token scanner fix