solving mass-disconnect issue