hotfix for event