Minor fix to CLI