diff --git flag.inc flag.inc
index 4115968..b133dfd 100644
--- flag.inc
+++ flag.inc
@@ -1456,7 +1456,7 @@ class flag_comment extends flag_flag {
 
     // Ensure node types are granted access. This avoids a
     // node_load() on every type, usually done by applies_to_content_id().
-    $query = db_select('comments', 'c');
+    $query = db_select('comment', 'c');
     $query->innerJoin('node', 'n', 'c.nid = n.nid');
     $result = $query
       ->fields('c', array('cid'))
@@ -1532,7 +1532,7 @@ class flag_comment extends flag_flag {
 
   function get_views_info() {
     return array(
-      'views table' => 'comments',
+      'views table' => 'comment',
       'join field' => 'cid',
       'title field' => 'subject',
       'title' => t('Comment flag'),
diff --git flag.module flag.module
index cffca6c..d409340 100644
--- flag.module
+++ flag.module
@@ -964,7 +964,7 @@ function flag_flag_access_multiple($flag, $content_ids, $account) {
 
   if ($flag->content_type == 'comment') {
     // Restrict access by comment ownership.
-    $query = db_select('comments', 'c');
+    $query = db_select('comment', 'c');
     $query->leftJoin('node', 'n', 'c.nid = n.nid');
     $result = $query
       ->fields('c', array('cid', 'nid'))