Fix EventHandler.