Fix for file names/destination with spaces