Fix to support Windows paths