Fix for broken-ness on Windows