fixed for event object refactor