Fixed all connection issues
Revert "Fixed all connection issues"

This reverts commit b1fe59cdfb11d77204be0da702221a2399714eb8.
Actually fixed all connection issues