Fix window test failure. Fix issue #875