Server connection fix