Bear hotfix