--- modules/comment/comment.module.orig	2007-03-02 17:22:13.000000000 +0100
+++ modules/comment/comment.module	2007-03-13 11:49:53.000000000 +0100
@@ -1700,8 +1700,9 @@
     $comment->comment = check_markup($comment->comment, $comment->format, FALSE);
 
     // Comment API hook
-    comment_invoke_comment($comment, 'view');
-
+    foreach(comment_invoke_comment($comment, 'view') as $key => $value) {
+      $comment->$key = $value;
+    }
     $output .= theme('comment', $comment, $links);
   }
   else {