diff --git a/apteryxd.c b/apteryxd.c
index ded3ab4..ce27977 100644
--- a/apteryxd.c
+++ b/apteryxd.c
@@ -1051,7 +1051,13 @@ _traverse_paths (GList **paths, GList **values, const char *path)
         /* Append any provided paths */
         GList *providers = NULL;
         providers = config_search_providers (path_s);
-        children = g_list_concat (children, providers);
+        for (iter = providers; iter; iter = iter->next)
+        {
+            char *p = (char*)iter->data;
+            if (!g_list_find_custom (children, p, (GCompareFunc)strcmp))
+                children = g_list_prepend (children, strdup (p));
+        }
+        g_list_free_full (providers, free);
     }
     for (iter = children; iter; iter = g_list_next (iter))
     {
@@ -1248,6 +1254,7 @@ handle_query (rpc_message msg)
     for (ipath = g_list_first (matches), ivalue = g_list_first (value_matches);
          ipath && ivalue; ipath = g_list_next (ipath), ivalue = g_list_next (ivalue))
     {
+        DEBUG ("  %s = %s\n", (char *) ipath->data, (char *) ivalue->data);
         rpc_msg_encode_string (msg, (char *) ipath->data);
         rpc_msg_encode_string (msg, (char *) ivalue->data);
     }
diff --git a/test.c b/test.c
index 8319fc3..a61a4b0 100644
--- a/test.c
+++ b/test.c
@@ -3245,6 +3245,37 @@ test_query_two_branches ()
     apteryx_prune (TEST2_PATH);
 }
 
+void
+test_query_provided ()
+{
+    const char *path = TEST_PATH"/devices/*/interfaces/*/state";
+    GNode *root = NULL;
+    GNode *rroot = NULL;
+
+    CU_ASSERT (apteryx_provide (path, test_provide_cb));
+
+    root = APTERYX_NODE (NULL, TEST_PATH"/devices/unit1/interfaces/eth0");
+    APTERYX_LEAF (root, "ifname", "eth0");
+    CU_ASSERT (apteryx_set_tree (root));
+    g_node_destroy (root);
+
+    root = APTERYX_NODE (NULL, TEST_PATH"/devices/unit1/interfaces/eth1");
+    APTERYX_LEAF (root, "ifname", "eth1");
+    CU_ASSERT (apteryx_set_tree (root));
+    g_node_destroy (root);
+
+    root = g_node_new (strdup ("/"));
+    apteryx_path_to_node (root, TEST_PATH"/devices/*", NULL);
+    rroot = apteryx_query (root);
+    CU_ASSERT (g_node_n_nodes (rroot, G_TRAVERSE_LEAVES) == 4);
+
+    apteryx_free_tree (rroot);
+    apteryx_free_tree (root);
+
+    CU_ASSERT (apteryx_unprovide (path, test_provide_cb));
+    apteryx_prune (TEST_PATH);
+}
+
 void
 test_cas_tree ()
 {
@@ -5296,6 +5327,7 @@ static CU_TestInfo tests_api_tree[] = {
     { "query two star", test_query_two_star},
     { "query null values", test_query_null_values},
     { "query two branches", test_query_two_branches},
+    { "query provided", test_query_provided},
     { "cas tree", test_cas_tree},
     { "tree atomic", test_tree_atomic},
     CU_TEST_INFO_NULL,