Fix validating