Commit with separate family analysis corrected