FIX: Allow spaces in paths