CLOUD-216 fixed scopes