helper hotfix