Fixed a problem with paths containing whitespace