fixed connection issues#