Fix fetching wrong token bug