Made it work on windows