Bugfix pubsub