Bug fix, paths can contain spaces