Settings hotfix