Re-Fix for publish mechanism