Hotfix for $event II