Fix Disconnect Issue