Fix Disconnect of way with multiple intersections (fixes #1955)