Hot fix for EventListener!