Minor fix for CLI