diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index b7d0bb04e3..e317290c7d 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-11  Sancho Lerena <slerena@artica.es>
+
+        * bin/pandora_network: Restored lock for icmp / ping calls.
+
 2009-02-11  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/DB.pm: Combined alerts are working again.
diff --git a/pandora_server/bin/pandora_network b/pandora_server/bin/pandora_network
index 5432fbc209..490ed5c13b 100755
--- a/pandora_server/bin/pandora_network
+++ b/pandora_server/bin/pandora_network
@@ -301,7 +301,7 @@ sub pandora_ping_icmp {
 		my $p;
 	 	# Some hosts don't accept ICMP with too small payload. Use 16 Bytes min
 		{
-			#lock $icmp_lock;
+			lock $icmp_lock;
 	 		$p = Net::Ping->new("icmp", $l_timeout, 32);
 		 	$result = $p->ping($dest);
 		}
diff --git a/pandora_server/bin/pandora_plugin b/pandora_server/bin/pandora_plugin
index 603659ba83..de026d1724 100755
--- a/pandora_server/bin/pandora_plugin
+++ b/pandora_server/bin/pandora_plugin
@@ -301,6 +301,9 @@ sub exec_plugin_module {
 	my $query_sql = "SELECT * FROM tagente_modulo WHERE id_agente_modulo = $id_am";
 	my $exec_sql = $dbh->prepare($query_sql);
 	$exec_sql ->execute;
+	
+	# TODO: Do a check for void result ! (Gives a DBD::mysql::st execute failed: MySQL server has gone away at /usr/local/bin/pandora_plugin line 304)
+	
 	$agent_module = $exec_sql->fetchrow_hashref;
 
 	# Get a full hash for plugin record reference ($plugin)