flow management fix