Fix option traversal