CLOUD-333 cs fix