BTW, does this fix windows problem?  In that case, can you do a PR only for this part? (and remove the FIXME line please)