Fixes #4770 using 'annotation' for event type