Rushed fix for connection mishandling.