fix the event firing