Now tracking is correct for elements any nesting level