Another attempted fix for Windows