Fix for file paths with spaces