Fixing support for Windows