Fix same event trigger