Fixes 4

Fix for stuck windows.