update to fix event processing