Fix window identification

Fix windows identification