Bug Fix and Tree Neighbors