Waitlist fix