Fix subtree consolidation