Hotfix for $event