diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 5f4078677..5761bd581 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-04-15 16:07:39 $
-|     $Author: lisa_ $
+|     $Revision: 1.5 $
+|     $Date: 2007-05-04 19:32:22 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -743,8 +743,8 @@ class comment {
 
 				//	downloads
 				}elseif($row['comment_type'] == "2"){
-					$mp = MPREFIX;
-					$qryd = "SELECT download_name, {$mp}download_category.download_category_class, {$mp}download_category.download_category_id, {$mp}download_category.download_category_name FROM {$mp}download LEFT JOIN {$mp}download_category ON {$mp}download.download_category={$mp}download_category.download_category_id WHERE {$mp}download.download_id={$row['comment_item_id']} AND {$mp}download_category.download_category_class REGEXP '".e_CLASS_REGEXP."' ";
+//					$mp = MPREFIX;
+					$qryd = "SELECT d.download_name, dc.download_category_class, dc.download_category_id, dc.download_category_name FROM #download AS d LEFT JOIN #download_category AS dc ON d.download_category=dc.download_category_id WHERE d.download_id={$row['comment_item_id']} AND dc.download_category_class REGEXP '".e_CLASS_REGEXP."' ";
 					if($sql2->db_Select_gen($qryd)){
 						$row2 = $sql2->db_Fetch();