Fixed disconnection bug (again)