fix event handler args