CLOUD-216 validation fix