Fix event firing