diff --git a/ChangeLog b/ChangeLog
index a7667f87e..baa889ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Check option of the nodetree instead
+	of checking configuration (thanks to Eric Cestari)(EJAB-737)
+
 2008-12-17  Pablo Polvorin	<pablo.polvorin@process-one.net>
 
 	* src/mod_muc/mod_muc_room.erl: Fix bug in MUC invite.
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 48d2ca061..0440f24b3 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1244,8 +1244,8 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) ->
 				    ok ->
 					node_call(Type, create_node, [Host, Node, Owner]);
 				    {error, 'conflict'} ->
-					case ets:lookup(gen_mod:get_module_proc(ServerHost, pubsub_state), nodetree) of
-					    [{nodetree, nodetree_virtual}] -> node_call(Type, create_node, [Host, Node, Owner]);
+					case proplists:get_value(virtual_tree, tree_call(Host, options, [])) of
+					    true -> node_call(Type, create_node, [Host, Node, Owner]);
 					    _ -> {error, 'conflict'}
 					end;
 				    Error ->