Publish fix for Listener accumulation