Another attempted fix for Windows, #2