Fixed traversal issues