fix split-window as well