Fixing the disconnect bug.