Fix up find_by_name