diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index e161e65416..d34d274d67 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-06  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent: Syntactic fix. Fixes bug #2173.
+
 2013-04-21  Junichi Satoh  <junichi@rworks.jp>
 
 	* pandora_agent_installer: Added support for NetBSD.
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index b1282b2ffb..f2b5ae580c 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -524,7 +524,7 @@ sub parse_conf_modules($) {
 					for (my $i = 0; $i <= $#{$module->{$token}}; $i++) {
 						
 						# Array of configuration tokens
-						foreach my $key (keys ($module->{$token}->[$i])) {
+						foreach my $key (keys (%{$module->{$token}->[$i]})) {
 							
 							# Each configuration token is a hash
 							while (my ($macro, $subst) = each (%{$module->{'macros'}})) {