connection management fix