Fix issue with traversal