A little change to EventHandlers.class