FlowWaiters fixed