Fixed a really nasty bug with self-subscription causing deadlock