Aligned windows version to un*x one.