PubSub bugfix