Fix issue #38 for unfullscreen