Yet another attempt to fix Windows