Fixed problem with directory names with spaces