Button hotfix