Dirs with spaces bug fixed