Fix my PubSub