fixed initial connection issues