Fix: Events not being updated on changes