Merge pull request #2276 from sjpadgett/eligibility-bug