Lineage fix