Fixed issue with event id