Update traversal to fix stage issues