Fixed problems with traversal.