Register window hotfix