#77 bug fix in PubSub