fixed the event context stuff