Fix handling of existing announcements