Added hotfix for window name