diff --git a/commentformsettings/commentformsettings.module b/commentformsettings/commentformsettings.module
index c95da3c..dee7b31 100644
--- a/commentformsettings/commentformsettings.module
+++ b/commentformsettings/commentformsettings.module
@@ -228,13 +228,20 @@ function commentformsettings_purge($type = NULL) {
  * Implementation of hook_features_pipe_alter() for node component.
  */
 function commentformsettings_features_pipe_node_alter(&$pipe, $data, $export, $module_name) {
-  if (!empty($data) && module_exists('strongarm')) {
+  if (!empty($export['features']['node']) && module_exists('strongarm')) {
+		$map = features_get_default_map('variable');
     $variables = array(
       'commentformsettings_',		
     );
-    foreach ($data as $node_type) {
+    foreach ($export['features']['node'] as $node_type) {
       foreach ($variables as $variable_name) {
-        $pipe['variable'][] = "{$variable_name}_{$node_type}";
+				$variable_name = "{$variable_name}_{$node_type}";
+				if (isset($map[$variable_name]) && $map[$variable_name] != $module_name) {
+          $export['dependencies'][$map[$variable_name]] = $map[$variable_name];
+        }
+        else {
+          $pipe['variable'][] = $variable_name;
+        }
       }
     }
   }
diff --git a/nodeformsettings.module b/nodeformsettings.module
index 522e491..5c10081 100644
--- a/nodeformsettings.module
+++ b/nodeformsettings.module
@@ -226,13 +226,20 @@ function nodeformsettings_purge($type = NULL) {
  * Implementation of hook_features_pipe_alter() for node component.
  */
 function nodeformsettings_features_pipe_node_alter(&$pipe, $data, $export, $module_name) {
-  if (!empty($data) && module_exists('strongarm')) {
+  if (!empty($export['features']['node']) && module_exists('strongarm')) {
+		$map = features_get_default_map('variable');
     $variables = array(
       'nodeformsettings_',		
     );
-    foreach ($data as $node_type) {
+    foreach ($export['features']['node'] as $node_type) {
       foreach ($variables as $variable_name) {
-        $pipe['variable'][] = "{$variable_name}_{$node_type}";
+				$variable_name = "{$variable_name}_{$node_type}";
+				if (isset($map[$variable_name]) && $map[$variable_name] != $module_name) {
+          $export['dependencies'][$map[$variable_name]] = $map[$variable_name];
+        }
+        else {
+          $pipe['variable'][] = $variable_name;
+        }
       }
     }
   }