CLOUD-207 fixed issue