Removed event listener hack