Window fix (3/48)

Window fix