fix duplicate events