token bug fixed