Fixed for files with space in the name