Fixing connection endpoint