Fix window to consider ordering