Fixed shuffle and waiting list issue.