Fix validation