diff --git a/src/context.c b/src/context.c
index 73f04e7d..b5d3ab09 100644
--- a/src/context.c
+++ b/src/context.c
@@ -3268,7 +3268,8 @@ getdns_context_get_suffix(getdns_context *context, getdns_list **value)
 			r = GETDNS_RETURN_GENERIC_ERROR;
 			break;
 		}
-		if ((r = _getdns_list_append_string(list, name)))
+		if ((r = _getdns_list_append_const_bindata(
+		    list, strlen(name), name)))
 			break;
 		dname += dname_len;
 		dname_len = *dname++;
diff --git a/src/dict.c b/src/dict.c
index e07ce794..f543e4bc 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -280,7 +280,8 @@ getdns_dict_get_names(const getdns_dict *dict, getdns_list **answer)
 
 	RBTREE_FOR(item, struct getdns_dict_item *,
 		(_getdns_rbtree_t *)&(dict->root)) {
-		_getdns_list_append_string(*answer, item->node.key);
+		_getdns_list_append_const_bindata(*answer,
+		    strlen(item->node.key) + 1, item->node.key);
 	}
 	return GETDNS_RETURN_GOOD;
 }				/* getdns_dict_get_names */