Windows fix for #30