Fixed lingering connections issue