Fixed event accessor handling.