fixed connection issues