Fix on error due to directory path with spaces