fixed eligibility validation