Minor fix/improvement