diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 4da738ae6..753238506 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -3634,7 +3634,7 @@ select_type(ServerHost, Host, Node, Type) ->
     SelectedType = case Host of
     {_User, _Server, _Resource} -> 
 	case catch ets:lookup(gen_mod:get_module_proc(ServerHost, config), pep_mapping) of
-	[{pep_mapping, PM}] -> proplists:get_value(Node, PM, ?PEPNODE);
+	[{pep_mapping, PM}] -> proplists:get_value(node_to_string(Node), PM, ?PEPNODE);
 	_ -> ?PEPNODE
 	end;
     _ -> 
diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl
index acbad24ba..e439fddb1 100644
--- a/src/mod_pubsub/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub/mod_pubsub_odbc.erl
@@ -3469,7 +3469,7 @@ select_type(ServerHost, Host, Node, Type) ->
     SelectedType = case Host of
     {_User, _Server, _Resource} -> 
 	case catch ets:lookup(gen_mod:get_module_proc(ServerHost, config), pep_mapping) of
-	[{pep_mapping, PM}] -> proplists:get_value(Node, PM, ?PEPNODE);
+	[{pep_mapping, PM}] -> proplists:get_value(node_to_string(Node), PM, ?PEPNODE);
 	_ -> ?PEPNODE
 	end;
     _ ->