*8994* Avoid triggering public events twice