ClientSide: fix waiter