Fixed traversal; samples OK