Token bug fixed