#111 fixed flaw in PubSub