Fixing initial version for Windows.