Fix traversal bug

* Work incomplete on failing test case