Window fix (9/48)

Window fix