Fixed connection bug