Fixed a bug with waiting list