Fix validation on add