I added this more as "performance" optimization as no need for recursively reading tree.
I can revert it if you thing it could cause problems.