Fix tie + disconnect bug