Fix EventListen processing bug