Window fix (19/48)

Window fix