diff -ruN fivestar_org/fivestar_comment.module fivestar/fivestar_comment.module
--- fivestar_org/fivestar_comment.module	2009-07-01 01:28:35.000000000 +0100
+++ fivestar/fivestar_comment.module	2009-10-10 23:11:56.000000000 +0100
@@ -142,7 +142,7 @@
           }
         }
         elseif ($fivestar_status != FIVESTAR_COMMENT_DISABLED && isset($current_rating['value'])) {
-          fivestar_comment_delete($comment->cid, $comment->nid, $comment->uid);
+          fivestar_comment_delete($comment->cid, $comment->nid, $current_rating['vote_id']);
         }
         $comment = (array)$comment;
       }
@@ -173,7 +173,7 @@
  */
 function fivestar_comment_update($cid, $nid, $uid, $value) {
   $vote = _fivestar_cast_vote('node', $nid, $value, 'vote', $uid);
-  db_query('UPDATE {fivestar_comment} SET value = %d, vote_id = %d WHERE cid = %d', $value, $vote['user']['vote_id'], $cid);
+  db_query('UPDATE {fivestar_comment} SET value = %d, vote_id = %d WHERE cid = %d', $value, $vote['vote_id'], $cid);
 }
 
 /**
@@ -181,7 +181,7 @@
  */
 function fivestar_comment_insert($cid, $nid, $uid, $value) {
   $vote = _fivestar_cast_vote('node', $nid, $value, 'vote', $uid);
-  db_query('INSERT INTO {fivestar_comment} (cid, vote_id, value) VALUES (%d, %d, %d)', $cid, $vote['user']['vote_id'], $value);
+  db_query('INSERT INTO {fivestar_comment} (cid, vote_id, value) VALUES (%d, %d, %d)', $cid, $vote['vote_id'], $value);
 }
 
 /**