Add more escaping to make windows directory names happy