Fixed Connection Bug