Event processing fix