CLOUD-160 fixed validation