Fixed bug on event id not available