Fix: use event method