Fixing disconnect issue