crash on reconnect fixed
merge