fix-fire-dynamic-event