Switch validation order