Fix for using access_token