depth fix and window fix