fix assembly traversal