Fixes #3: window-frame issues