Another attempt to fix on windows