Build 25 addition: leaf 0 handling