working on disconnect issue