Bugfix: Events and Announcement working as expected