fix event listener issue
fix event listener issue