Another try to get disconnect working.