Hotfix for Windows machines