Fixing usage of access token