Fixed access-token duplicate issue