Fix multiple connections aliases being rewritten
Merge pull request #748 from bocribbz/fix-multiple-connections

Fix multiple connections aliases being rewritten