1.55: more consistent internal event fire