Errors in the validation, needs improvement