Added an exception for events