fixing pubsub