Fixing connection bug