Fix for #20 on Windows