Fix #104. Speed up disconnect process