Fix issue with spacey file names