diff --git a/features.export.inc b/features.export.inc
index 12a6f32..4ba8cb5 100644
--- a/features.export.inc
+++ b/features.export.inc
@@ -862,10 +862,10 @@ function features_get_conflict_map($component_type) {
     $component_map = array();
     foreach (features_get_component_map($component_type) as $component => $modules) {
       if ($modules = array_filter($modules, 'module_exists')) {
-        $map[$component_type][$component] = $modules;
+        $component_map[$component] = $modules;
       }
     }
-    $map[$component_type] = $component_map();
+    $map[$component_type] = $component_map;
   }
   return $map[$component_type];
 }