Fix Bug 876101 2.0 (Windows)