Fix/reconnect race