Fixed duplicate event IDs