UNIX/Windows machine fixed