Fix to work properly on windows