Waitlist index fix