fix add/remove connection