Minor fix/enhancement