Workaround for waitlist order