--- comment.module.old	2008-10-29 22:38:59.000000000 +0100
+++ comment.module	2008-10-29 22:39:24.000000000 +0100
@@ -968,7 +968,7 @@ function comment_render($node, $cid = 0)
 
       if ($order == COMMENT_ORDER_NEWEST_FIRST) {
         if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {
-          $query .= ' ORDER BY c.cid DESC';
+          $query .= ' ORDER BY c.timestamp DESC';
         }
         else {
           $query .= ' ORDER BY c.thread DESC';
@@ -976,7 +976,7 @@ function comment_render($node, $cid = 0)
       }
       else if ($order == COMMENT_ORDER_OLDEST_FIRST) {
         if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {
-          $query .= ' ORDER BY c.cid';
+          $query .= ' ORDER BY c.timestamp';
         }
         else {
           // See comment above. Analysis reveals that this doesn't cost too