Fix callback, remove eventListener