Attempt fix for Windows