Trying to fix connection issues