Fix validation problem