diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 093bc078f5..fd710f4c75 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -662,6 +662,8 @@ sub parse_conf_modules($) {
 			$module->{'ff_timeout'} = $1;
 		} elsif ($line =~ /^\s*module_each_ff\s+(\S+)\s*$/) {
 			$module->{'each_ff'} = $1;
+		} elsif ($line =~ /^\s*module_ff_type\s+(\d+)\s*$/) {
+			$module->{'ff_type'} = $1;
 		# Macros
 		} elsif ($line =~ /^\s*module_macro(\S+)\s+(.*)\s*$/) {
 			$module->{'macros'}{$1} = $2;
@@ -2532,6 +2534,7 @@ sub write_module_xml ($@) {
 	$Xml .= "	<min_ff_event_critical>" . $module->{'min_ff_event_critical'} . "</min_ff_event_critical>\n" if (defined ($module->{'min_ff_event_critical'}));
 	$Xml .= "	<ff_timeout>" . $module->{'ff_timeout'} . "</ff_timeout>\n" if (defined ($module->{'ff_timeout'}));
 	$Xml .= "	<each_ff>" . $module->{'each_ff'} . "</each_ff>\n" if (defined ($module->{'each_ff'}));
+	$Xml .= "	<ff_type>" . $module->{'ff_type'} . "</ff_type>\n" if (defined ($module->{'ff_type'}));
 
 	# Data list
 	if ($#data > 0) {
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index bc66eb2d72..8e08a7d482 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -641,7 +641,7 @@ sub process_module_data ($$$$$$$$$$) {
 	            'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0,
 				'module_ff_interval' => 0, 'alert_template' => '', 'crontab' =>	'', 'min_ff_event_normal' => 0,
 				'min_ff_event_warning' => 0, 'min_ff_event_critical' => 0, 'ff_timeout' => 0, 'each_ff' => 0, 'module_parent' => 0,
-				'module_parent_unlink' => 0, 'cron_interval' => 0};
+				'module_parent_unlink' => 0, 'cron_interval' => 0, 'ff_type' => 0};
 	
 	# Other tags will be saved here
 	$module_conf->{'extended_info'} = '';