Fixed trigger on events