Fix validation order. Revision v1.0.1