CLOUD-333 fixed component