Fixed window issue