fixed multiple token bug