Fix issue with disconnect + reconnect