Still has subwindow bug