Fix validation 2