Small modification that makes sure that the access token is handled correctly.