Pubsub fixed