Fix event triggering