Fix token exchange