Fixed to work on windows