Announce/Event Announce fix