diff --git a/src/plugins_types/binary.c b/src/plugins_types/binary.c
index 8049476..df77177 100644
--- a/src/plugins_types/binary.c
+++ b/src/plugins_types/binary.c
@@ -341,7 +341,7 @@
     LY_ERR ret;
     struct lyd_value_binary *orig_val, *dup_val;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_RET(ret);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);
diff --git a/src/plugins_types/bits.c b/src/plugins_types/bits.c
index 82e41d9..c0765c4 100644
--- a/src/plugins_types/bits.c
+++ b/src/plugins_types/bits.c
@@ -439,7 +439,7 @@
     memset(dup, 0, sizeof *dup);
 
     /* optional canonical value */
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_GOTO(ret, error);
 
     /* allocate value */
diff --git a/src/plugins_types/date_and_time.c b/src/plugins_types/date_and_time.c
index be1bd04..cbc1578 100644
--- a/src/plugins_types/date_and_time.c
+++ b/src/plugins_types/date_and_time.c
@@ -226,7 +226,7 @@
     memset(dup, 0, sizeof *dup);
 
     /* optional canonical value */
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_GOTO(ret, error);
 
     /* allocate value */
diff --git a/src/plugins_types/instanceid.c b/src/plugins_types/instanceid.c
index 88fc6ec..af54700 100644
--- a/src/plugins_types/instanceid.c
+++ b/src/plugins_types/instanceid.c
@@ -317,7 +317,7 @@
     memset(dup, 0, sizeof *dup);
 
     /* canonical value */
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_GOTO(ret, error);
 
     /* copy path */
diff --git a/src/plugins_types/ipv4_address.c b/src/plugins_types/ipv4_address.c
index db7f60e..176a726 100644
--- a/src/plugins_types/ipv4_address.c
+++ b/src/plugins_types/ipv4_address.c
@@ -306,7 +306,7 @@
     LY_ERR ret;
     struct lyd_value_ipv4_address *orig_val, *dup_val;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_RET(ret);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);
diff --git a/src/plugins_types/ipv4_prefix.c b/src/plugins_types/ipv4_prefix.c
index da64ae0..d630279 100644
--- a/src/plugins_types/ipv4_prefix.c
+++ b/src/plugins_types/ipv4_prefix.c
@@ -270,7 +270,7 @@
     LY_ERR ret;
     struct lyd_value_ipv4_prefix *orig_val, *dup_val;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_RET(ret);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);
diff --git a/src/plugins_types/ipv6_address.c b/src/plugins_types/ipv6_address.c
index a7411b7..e7a5066 100644
--- a/src/plugins_types/ipv6_address.c
+++ b/src/plugins_types/ipv6_address.c
@@ -310,7 +310,7 @@
 
     memset(dup, 0, sizeof *dup);
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_RET(ret);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);
diff --git a/src/plugins_types/ipv6_address_no_zone.c b/src/plugins_types/ipv6_address_no_zone.c
index 7c815c0..220f377 100644
--- a/src/plugins_types/ipv6_address_no_zone.c
+++ b/src/plugins_types/ipv6_address_no_zone.c
@@ -247,7 +247,7 @@
     LY_ERR ret;
     struct lyd_value_ipv6_address_no_zone *orig_val, *dup_val;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_RET(ret);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);
diff --git a/src/plugins_types/ipv6_prefix.c b/src/plugins_types/ipv6_prefix.c
index b728c34..6cf6790 100644
--- a/src/plugins_types/ipv6_prefix.c
+++ b/src/plugins_types/ipv6_prefix.c
@@ -284,7 +284,7 @@
     LY_ERR ret;
     struct lyd_value_ipv6_prefix *orig_val, *dup_val;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_RET(ret);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);
diff --git a/src/plugins_types/union.c b/src/plugins_types/union.c
index f560ee9..971ced1 100644
--- a/src/plugins_types/union.c
+++ b/src/plugins_types/union.c
@@ -308,7 +308,7 @@
     memset(dup, 0, sizeof *dup);
     dup->realtype = original->realtype;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_GOTO(ret, cleanup);
 
     dup_val = calloc(1, sizeof *dup_val);
diff --git a/src/plugins_types/xpath1.0.c b/src/plugins_types/xpath1.0.c
index cbe86f4..b98c59c 100644
--- a/src/plugins_types/xpath1.0.c
+++ b/src/plugins_types/xpath1.0.c
@@ -378,7 +378,7 @@
     memset(dup, 0, sizeof *dup);
     dup->realtype = original->realtype;
 
-    ret = lydict_insert(ctx, original->_canonical, ly_strlen(original->_canonical), &dup->_canonical);
+    ret = lydict_insert(ctx, original->_canonical, 0, &dup->_canonical);
     LY_CHECK_GOTO(ret, cleanup);
 
     LYPLG_TYPE_VAL_INLINE_PREPARE(dup, dup_val);