Fixed access token getting in some cases