Fixed no events bug