Window fix (44/48)

Window fix