Fix tree-based measurement