BUG - WaitList implementation