Fixed functions match in removeEventListener