Fix event deduplicate