fix event listeners
fix event listeners