Started fix for infinite recursion in directory trees.