Really fixed reconnect problem