Fix PubSubListener