performance/event fix