fix publish-subscribe