fixed waiter