diff --git a/modules/comment/views_handler_argument_comment_user_uid.inc b/modules/comment/views_handler_argument_comment_user_uid.inc
index 1ba56e8..dfba09c 100644
--- a/modules/comment/views_handler_argument_comment_user_uid.inc
+++ b/modules/comment/views_handler_argument_comment_user_uid.inc
@@ -36,12 +36,10 @@ class views_handler_argument_comment_user_uid extends views_handler_argument {
   function query($group_by = FALSE) {
     $this->ensure_my_table();
 
-    $nid_alias = $this->query->add_field('node', 'nid');
-
     $subselect = db_select('comment', 'c');
     $subselect->addField('c', 'cid');
     $subselect->condition('c.uid', $this->argument);
-    $subselect->where("c.nid = $nid_alias");
+    $subselect->where("c.nid = $this->table_alias.nid");
 
     $condition = db_or()
       ->condition("$this->table_alias.uid", $this->argument, '=')
diff --git a/modules/comment/views_handler_filter_comment_user_uid.inc b/modules/comment/views_handler_filter_comment_user_uid.inc
index 1dbf2f1..f2fb3df 100644
--- a/modules/comment/views_handler_filter_comment_user_uid.inc
+++ b/modules/comment/views_handler_filter_comment_user_uid.inc
@@ -12,6 +12,7 @@ class views_handler_filter_comment_user_uid extends views_handler_filter_user_na
     $subselect->addField('c', 'cid');
     $subselect->condition('c.uid', $this->value, $this->operator);
     $subselect->where("nid = $this->table_alias.nid");
+    $subselect->where("c.nid = $this->table_alias.nid");
 
     $condition = db_or()
       ->condition("$this->table_alias.uid", $this->value, $this->operator)