event control fix