Fix issue with disconnects