Fixed potential problem with whitespace in dir names.