diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index fca126dc6e..8a993b7ced 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-19  Koichiro Kikuchi  <koichiro@rworks.jp>
+
+	* pandora_agent: Also added the temporal directory to the file path
+	 for symlink check.
+
 2012-04-18  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent: Add the temporal directory to the file path before
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 5ed9aafd24..5a30b03475 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -704,8 +704,8 @@ sub send_buffered_xml_files () {
 	opendir(TEMPORAL, $Conf{'temporal'}) or return;
 	while (my $xml_file = readdir(TEMPORAL)) { 
 	
-		# Skip symlink and non data files
-		next if (-l $xml_file || $xml_file !~ m/\.data$/);
+		# Skip non data files and symlinks
+		next if ($xml_file !~ m/\.data$/ || -l "$Conf{'temporal'}/$xml_file");
 
 		send_file ("$Conf{'temporal'}/$xml_file", 1);
 	}