Category: lineage bugs fix