diff --git a/src/xml.c b/src/xml.c
index c41aa5f..473f5cf 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -93,16 +93,17 @@
 lyxml_correct_attr_ns(struct ly_ctx *ctx, struct lyxml_attr *attr, struct lyxml_elem *attr_parent, int copy_ns)
 {
     const struct lyxml_ns *tmp_ns;
-    struct lyxml_elem *ns_root;
+    struct lyxml_elem *ns_root, *attr_root;
 
     if ((attr->type != LYXML_ATTR_NS) && attr->ns) {
-        for (; attr_parent->parent; attr_parent = attr_parent->parent);
+        /* find the root of attr */
+        for (attr_root = attr_parent; attr_root->parent; attr_root = attr_root->parent);
 
         /* find the root of attr NS */
         for (ns_root = attr->ns->parent; ns_root->parent; ns_root = ns_root->parent);
 
-        /* elem NS is defined outside elem subtree */
-        if (ns_root != attr_parent) {
+        /* attr NS is defined outside attr parent subtree */
+        if (ns_root != attr_root) {
             if (copy_ns) {
                 tmp_ns = attr->ns;
                 /* we may have already copied the NS over? */
@@ -110,7 +111,7 @@
 
                 /* we haven't copied it over, copy it now */
                 if (!attr->ns) {
-                    attr->ns = (struct lyxml_ns *)lyxml_dup_attr(ctx, attr->ns->parent, (struct lyxml_attr *)tmp_ns);
+                    attr->ns = (struct lyxml_ns *)lyxml_dup_attr(ctx, attr_parent, (struct lyxml_attr *)tmp_ns);
                 }
             } else {
                 attr->ns = NULL;