Added fix for event methods.