Bug fix on Windows