Fixed for Windows.