fixed run event handlers