Fix for events with aliases