fixed event listeners