Attempted fix for Windows