--- modules/poll.module	2006-04-14 11:05:19.000000000 +0200
+++ poll_fix.module	2006-10-14 18:39:09.000000000 +0200
@@ -175,6 +175,8 @@ function poll_insert($node) {
 
   db_query("INSERT INTO {poll} (nid, runtime, active) VALUES (%d, %d, %d)", $node->nid, $node->runtime, $node->active);
 
+  // Reset counter
+  $i = 0;
   foreach ($node->choice as $choice) {
     if ($choice['chtext'] != '') {
       db_query("INSERT INTO {poll_choices} (nid, chtext, chvotes, chorder) VALUES (%d, '%s', %d, %d)", $node->nid, $choice['chtext'], $choice['chvotes'], $i++);