#442 fix in validations