Fixed the custom events.