Fixed the event selector