fixed sending duplicate events