Fixed auto-reconnection