fix event management