Fix Connection Bug