Fix no events bug