Fixed token bug