Fixed disconnect issue (again)