added fixed client validations