Fix bug of waiters