diff --git a/node_convert/modules/comment.node_convert_behavior.inc b/node_convert/modules/comment.node_convert_behavior.inc
index 4c6be21..04ea24f 100644
--- a/node_convert/modules/comment.node_convert_behavior.inc
+++ b/node_convert/modules/comment.node_convert_behavior.inc
@@ -13,15 +13,18 @@
 function comment_node_convert_change($data, $op) {
   if ($op == 'insert') {
     $node = $data['node'];
-    $tables = array('field_data_comment_body', 'field_revision_comment_body');
-
+    $prefix = $GLOBALS['databases']['default']['default']['prefix']; //TODO: Perhaphs make get current DB instead of default DB ?
+    $tables = array(
+        $prefix . 'field_data_comment_body', 
+        $prefix . 'field_revision_comment_body'
+      );
     foreach ($tables as $table) {
-      $query = '
-        UPDATE ' . $table . ' AS cb
-        LEFT JOIN comment AS c ON cb.entity_id = c.cid AND cb.entity_type = :entity_type
+      $query = "
+        UPDATE $table AS cb
+        LEFT JOIN {$prefix}comment AS c ON cb.entity_id = c.cid AND cb.entity_type = :entity_type
         SET cb.bundle = :new_bundle
         WHERE c.nid = :nid
-        ';
+        ";
       $args = array(':entity_type' => 'comment', ':nid' => $node->nid, ':new_bundle' => 'comment_node_' . $data['dest_node_type']);
       db_query($query, $args);
     }