Fixed FlowWaiter