New version
Another fix repeating triggering event