Further workaround for Windows?