tokenfield fix