fixing publish/subscribe