UI hotfix