This was modified on Windows
this is merged in Windows7