Fix for publish/subscribe error