diff --git a/webform_views_submitted.views.inc b/webform_views_submitted.views.inc
index 2543982..11b80eb 100644
--- a/webform_views_submitted.views.inc
+++ b/webform_views_submitted.views.inc
@@ -25,7 +25,7 @@ function webform_views_submitted_views_handlers() {
  * Imprementation of hook_views_submitted_data().
  */
 function webform_views_submitted_views_data() {
-  $res = db_query("SELECT c.cid, c.form_key, c.name, c.extra, c.type, n.title FROM {webform_component} c LEFT JOIN {node} n ON c.nid = n.nid");
+  $res = db_query("SELECT c.cid, n.nid, c.form_key, c.name, c.extra, c.type, n.title FROM {webform_component} c LEFT JOIN {node} n ON c.nid = n.nid");
   while($component = db_fetch_array($res)) {
     $data['webform_submitted_data_' . $component['form_key']]['table']['group'] = t('Webform submitted data');
     $data['webform_submitted_data_' . $component['form_key']]['table']['join'] = array(
@@ -36,7 +36,7 @@ function webform_views_submitted_views_data() {
         'extra' => array(
           array(
             'field'    => 'nid',
-            'value'    => 'webform_submissions.nid',
+            'value'    => $component['nid'],
             'operator' => '=',
             'numeric'  => TRUE,
           ),