Fix window issue