Maybe fix disconnections