Fixed disconnect issue #138