diff --git a/src/tree_data.c b/src/tree_data.c
index 893bdd0..d5099b3 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -2358,6 +2358,8 @@
         return NULL;
     }
 
+    assert(!first_sibling || (LYD_CTX(first_sibling) == LYD_CTX(new_node)));
+
     getnext_opts = 0;
     if (new_node->schema->flags & LYS_IS_OUTPUT) {
         getnext_opts = LYS_GETNEXT_OUTPUT;
@@ -2707,7 +2709,7 @@
     while (first) {
         iter = first->next;
         lyd_unlink_tree(first);
-        lyd_insert_node(parent, NULL, first, 0);
+        lyd_insert_node(parent, NULL, first, 1);
         first = iter;
     }
     return LY_SUCCESS;