Fix event publish