diff --git a/webform_sameas.module b/webform_sameas.module
index 1f2aa4d0..9698e6ea 100644
--- a/webform_sameas.module
+++ b/webform_sameas.module
@@ -120,16 +120,17 @@ function webform_sameas_form_process($element, &$form_state) {
  * Implements hook_webform_submission_presave().
  */
 function webform_sameas_webform_submission_presave($node, &$submission) {
-  $webform = $node->webform;
-  $sameas_components = webform_sameas_get_sameas_components($webform['components']);
-  foreach ($sameas_components as $component) {
-    $source_cid = $component['extra']['src_field'];
-    $target_cid = $component['extra']['target_field'];
-
-    if (!empty($source_cid) && !empty($target_cid)) {
-      if (isset($submission->data[$source_cid]) && isset($submission->data[$target_cid])) {
-        $submission->data[$target_cid] = $submission->data[$source_cid];
-        break;
+  $sameas_components = webform_sameas_get_sameas_components($node->webform['components']);
+  foreach ($sameas_components as $sameas_cid => $component) {
+    $sameas_checked = $submission->data[$sameas_cid][0];
+    if ($sameas_checked) {
+      $source_cid = $component['extra']['src_field'];
+      $target_cid = $component['extra']['target_field'];
+
+      if (!empty($source_cid) && !empty($target_cid)) {
+        if (isset($submission->data[$source_cid]) && isset($submission->data[$target_cid])) {
+          $submission->data[$target_cid] = $submission->data[$source_cid];
+        }
       }
     }
   }