Fix issue with windows