Index: branches/unlabeled/unlabeled-1.75.2/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r6514 -r6547
--- branches/unlabeled/unlabeled-1.75.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6514)
+++ branches/unlabeled/unlabeled-1.75.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6547)
@@ -1795,7 +1795,7 @@
 			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 
 			// 3. create virtual & calculated fields (for main item)
-			$calculated_fields = $this->Application->getUnitOption($main_prefix.'.', 'CalculatedFields', Array());
+			$calculated_fields = Array();
 			$virtual_fields = $this->Application->getUnitOption($main_prefix, 'VirtualFields', Array());
 
 			$cf_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
@@ -1831,8 +1831,14 @@
 				$virtual_fields['cust_'.$custom_name] = array_merge_recursive2($field_options, $virtual_fields['cust_'.$custom_name]);
 				$custom_fields[$custom_id] = $custom_name;
 			}
+			
+			$config_calculated_fields = $this->Application->getUnitOption($main_prefix, 'CalculatedFields', Array());
+			foreach ($config_calculated_fields as $special => $special_fields) {
+				$config_calculated_fields[$special] = array_merge_recursive2($config_calculated_fields[$special], $calculated_fields);
+			}
+			$this->Application->setUnitOption($main_prefix, 'CalculatedFields', $config_calculated_fields);
+			
 			$this->Application->setUnitOption($main_prefix, 'CustomFields', $custom_fields);
-			$this->Application->setUnitOption($main_prefix.'.', 'CalculatedFields', $calculated_fields);
 			$this->Application->setUnitOption($main_prefix, 'VirtualFields', $virtual_fields);
 		}