Correct event type
Fix event listener