fixed heterogeneous events bug