hotfix for events