fix slow traversal