Window fix (30/48)

Window fix