Fixed auto-reconnect