bugfixing disconnects