change: fix bugs in window variation