Fix validation order process