diff --git a/src/mod_pubsub/node_pep_odbc.erl b/src/mod_pubsub/node_pep_odbc.erl
index d6cda1cda..44c11cb5a 100644
--- a/src/mod_pubsub/node_pep_odbc.erl
+++ b/src/mod_pubsub/node_pep_odbc.erl
@@ -216,7 +216,7 @@ get_entity_subscriptions(_Host, Owner) ->
 	{selected, ["host", "node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
 	    lists:map(fun({H, N, T, I, J, S}) ->
 		O = node_hometree_odbc:decode_jid(H),
-		Node = nodetree_odbc:raw_to_node(O, {N, "", T, I}),
+		Node = nodetree_tree_odbc:raw_to_node(O, {N, "", T, I}),
 		{Node, node_hometree_odbc:decode_subscriptions(S), node_hometree_odbc:decode_jid(J)}
 	    end, RItems);
 	_ ->
@@ -250,7 +250,7 @@ get_entity_subscriptions_for_send_last(_Host, Owner) ->
 	{selected, ["host", "node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
 	    lists:map(fun({H, N, T, I, J, S}) ->
 		O = node_hometree_odbc:decode_jid(H),
-		Node = nodetree_odbc:raw_to_node(O, {N, "", T, I}),
+		Node = nodetree_tree_odbc:raw_to_node(O, {N, "", T, I}),
 		{Node, node_hometree_odbc:decode_subscriptions(S), node_hometree_odbc:decode_jid(J)}
 	    end, RItems);
 	_ ->