Access Token bug fix