Fixed duplicate event id's