fixing to work correctly with windows