CLOUD-32 fixed dependecy