Tentative fix for Windows