Fixed disconnect issue