Adjust firing of events