CLOUD-55 no need to loop