diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm
index a2453a8dd1..3712474f01 100644
--- a/pandora_server/lib/PandoraFMS/ReconServer.pm
+++ b/pandora_server/lib/PandoraFMS/ReconServer.pm
@@ -265,6 +265,7 @@ sub data_consumer ($$) {
 		# End of GIS code -----------------------------      
 		else {
 			# Create a new agent
+			logger ($pa_config, "Creating an agent through recon task: " . $host_name, 10);
 			$agent_id = pandora_create_agent ($pa_config, $pa_config->{'servername'},
 					                                  $host_name, $addr, $task->{'id_group'},
 									  $parent_id, $id_os, '', 300, $dbh);
@@ -362,9 +363,11 @@ sub get_host_parent {
 		# Check if the host exists
 		my $agent = get_agent_from_addr ($dbh, $host_addr);
 		if (defined ($agent)) {
-			# Move to the next host
-			$parent_id = $agent->{'id_agente'};
-			next;
+			# Move to the next host if module is not in learning mode
+			if ($agent->{'modo'} != 1) {
+				$parent_id = $agent->{'id_agente'};
+				next;
+			}
 		}
 		
 		
@@ -392,10 +395,20 @@ sub get_host_parent {
 		}
 		
 		# Create the host
-		my $agent_id = pandora_create_agent ($pa_config, $pa_config->{'servername'}, $host_name, $host_addr, $group, $parent_id, $id_os, '', 300, $dbh);
-		$agent_id = 0 unless defined ($parent_id);
-		db_do ($dbh, 'INSERT INTO taddress_agent (id_a, id_agent)
-			VALUES (?, ?)', $addr_id, $agent_id);
+		my $agent_id = 0;
+		my $agent_parent = get_agent_from_addr ($dbh, $host_addr);
+		if (!defined($agent_parent)) {
+			$agent_parent = get_agent_from_name($dbh, $host_addr);
+		}
+		if (defined ($agent_parent)) {
+			$agent_id = $agent_parent->{'id_agente'};
+			logger ($pa_config, "Updating agent " . $agent_id . " with parent $parent_id in host $host_addr");
+			db_do ($dbh, 'UPDATE tagente SET id_parent=? WHERE id_agente=?', $parent_id, $agent_id);
+		} else {
+			$agent_id = pandora_create_agent ($pa_config, $pa_config->{'servername'}, $host_name, $host_addr, $group, $parent_id, $id_os, '', 300, $dbh);
+			db_do ($dbh, 'INSERT INTO taddress_agent (id_a, id_agent)
+				VALUES (?, ?)', $addr_id, $agent_id);
+		}
 		
 		# Move to the next host
 		$parent_id = $agent_id;
diff --git a/pandora_server/util/recon_scripts/snmp-recon.pl b/pandora_server/util/recon_scripts/snmp-recon.pl
index b67288b1ea..9d269d1b6b 100755
--- a/pandora_server/util/recon_scripts/snmp-recon.pl
+++ b/pandora_server/util/recon_scripts/snmp-recon.pl
@@ -795,7 +795,7 @@ sub create_pandora_agent($) {
 		$agent = get_agent_from_name($DBH, $device);
 	}
 
-	my $agent_id;
+	my ($agent_id, $agent_learning);
 	if (!defined($agent)) {
 		my $id_os = 10; # Other.
 		my $device_type = $VISITED_DEVICES{$device}->{'type'};
@@ -809,9 +809,11 @@ sub create_pandora_agent($) {
 		$agent_id = pandora_create_agent(\%CONF, $CONF{'servername'}, $device, $device, $GROUP_ID, 0, $id_os, '', 300, $DBH);
 		return undef unless defined ($agent_id) and ($agent_id > 0);
 		pandora_event(\%CONF, "[RECON] New $device_type found (" . join(',', keys(%{$VISITED_DEVICES{$device}->{'addr'}})) . ").", $GROUP_ID, $agent_id, 2, 0, 0, 'recon_host_detected', 0, $DBH);
+		$agent_learning = 1 == 1;
 	}
 	else {
 		$agent_id = $agent->{'id_agente'};
+		$agent_learning = $agent->{'modo'} == 1;
 	}
 
 	# Add found IP addresses to the agent.
@@ -830,7 +832,7 @@ sub create_pandora_agent($) {
 
 	# Create a ping module.
 	my $module_id = get_agent_module_id($DBH, "ping", $agent_id);
-	if ($module_id <= 0) {
+	if ($module_id <= 0 && $agent_learning) {
 		my %module = ('id_tipo_modulo' => 6,
 			       'id_modulo' => 2,
 		           'nombre' => "ping",
@@ -866,7 +868,7 @@ sub create_pandora_agent($) {
 
 		# Check whether the module already exists.
 		my $module_id = get_agent_module_id($DBH, "ifOperStatus_${if_name}", $agent_id);
-		next if ($module_id > 0);
+		next if ($module_id > 0 && !$agent_learning);
 	
 		# Encode problematic characters.
 		$if_name = safe_input($if_name);
@@ -1044,7 +1046,7 @@ sub show_help {
 	print " * custom_field3 = a router in the network. Optional but recommended.\n\n";
 	print " * custom_field4 = set to -a to add all network interfaces (by default only interfaces that are up are added).\n\n";
 	print " Additional information:\nWhen the script is called from a recon task the task_id, group_id and create_incident";
-	print " parameters are automatically filled by the Pandora FMS Server.";
+	print " parameters are automatically filled by the Pandora FMS Server.\n";
 	exit;
 }
 
@@ -1082,23 +1084,26 @@ sub traceroute_connectivity($) {
 	
 	# Look for parents.
 	my $parent_id = 0;
+	my $child_id = $agent->{'id_agente'};
 	foreach my $hop (@hops) {
 		my $host_addr = $hop->ipaddr ();
 		
 		# Check if the parent agent exists.
-		my $agent = get_agent_from_addr ($DBH, $host_addr);
-		if (!defined($agent)) {
-			$agent = get_agent_from_name($DBH, $host_addr);
+		my $agent_parent = get_agent_from_addr ($DBH, $host_addr);
+		if (!defined($agent_parent)) {
+			$agent_parent = get_agent_from_name($DBH, $host_addr);
 		}
-		if (defined ($agent)) {
-			$parent_id = $agent->{'id_agente'};
-			last;
+		if (defined ($agent_parent)) {
+			$parent_id = $agent_parent->{'id_agente'};
+			next unless ($agent_parent->{'modo'} == 1);
+		} else {
+			$parent_id = create_pandora_agent ($host_addr);
+		}
+		# Connect the host to its parent.
+		if ($parent_id > 0) {
+			db_do($DBH, 'UPDATE tagente SET id_parent=? WHERE id_agente=?', $parent_id, $child_id);
+			$child_id = $parent_id;
 		}
-	}
-
-	# Connect the host to its parent.
-	if ($parent_id > 0) {
-		db_do($DBH, 'UPDATE tagente SET id_parent=? WHERE id_agente=?', $parent_id, $agent->{'id_agente'});
 	}
 }