Fixup to previous commit for windows