event-component fix