fixed broken waiter