CLOUD-103 fixed issue