Minor fix for values with spaces