Hotfix - events not triggering.