bugfixes
don't accidentally walk the whole tree