Fixed reference to GenericEvent