Fixed Token bug