Fix for using paths containing spaces