Changed position of validation.