Fixes the issues with the disconnects.