fixed token bug