Validating order fix