more solid support for win-builds