Fix EventTarget issue