Fixing a disconnect bug