fix event firing