perf improvement: better windows support ...)