OAK 1977: fix incorrect descend into index tree