Fixed the eligibility bug