hotfix from Impact project