event firing fix