Changed EHFOrder validation