Yes! And in closeConnectionToPeer. And terminate_ should also discard the reference to tag. Thanks!