diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 5d354dd6f..bfb971f8c 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -1671,7 +1671,7 @@ node_disco_info(Host, Node, From, Identity, Features) ->
 %	Other -> Other
 %    end.
     Action = fun (#pubsub_node{type = Type, id = NodeId}) ->
-		     I = Types = case tree_call(Host, get_subnodes,
+		     Types = case tree_call(Host, get_subnodes,
 						      [Host, Node, From])
 					   of
 					 [] -> [<<"leaf">>];
@@ -1687,7 +1687,7 @@ node_disco_info(Host, Node, From, Identity, Features) ->
 					       _ -> []
 					     end
 				       end,
-			       lists:map(fun (T) ->
+		    I = lists:map(fun (T) ->
 						 #xmlel{name = <<"identity">>,
 							attrs =
 							    [{<<"category">>,
diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl
index 422775d14..5602b6ef9 100644
--- a/src/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub_odbc.erl
@@ -1326,7 +1326,7 @@ node_disco_info(Host, Node, From, Identity, Features) ->
 %	Other -> Other
 %    end.
     Action = fun (#pubsub_node{type = Type, id = NodeId}) ->
-		     I = Types = case tree_call(Host, get_subnodes,
+		     Types = case tree_call(Host, get_subnodes,
 						      [Host, Node, From])
 					   of
 					 [] -> [<<"leaf">>];
@@ -1342,7 +1342,7 @@ node_disco_info(Host, Node, From, Identity, Features) ->
 					       _ -> []
 					     end
 				       end,
-			       lists:map(fun (T) ->
+		    I = lists:map(fun (T) ->
 						 #xmlel{name = <<"identity">>,
 							attrs =
 							    [{<<"category">>,