--- fivestar.module.bkp	2010-02-04 20:07:25.000000000 -0300
+++ fivestar.module	2010-02-04 21:00:48.000000000 -0300
@@ -156,15 +156,13 @@ function fivestar_form_alter(&$form, &$f
     $form['submit']['#weight'] = isset($form['submit']['#weight']) ? $form['submit']['#weight'] + 1 : 1;
     $form['delete']['#weight'] = isset($form['delete']['#weight']) ? $form['delete']['#weight'] + 1 : 1;
 
-    $form['fivestar'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Fivestar ratings'),
-      '#collapsible' => TRUE,
-      '#collapsed' => !variable_get('fivestar_'. $form['#node_type']->type, 0),
-      '#description' => t('To rate this content, enable Fivestar rating below. These settings will be used for both comments (if available) and direct rating.'),
-      '#theme' => 'fivestar_node_type_form',
-      '#attributes' => array('id' => 'fivestar-node-type-form'),
-    );
+    $form['fivestar']['#type'] = 'fieldset';
+    $form['fivestar']['#title'] = t('Fivestar ratings');
+    $form['fivestar']['#collapsible'] = TRUE;
+    $form['fivestar']['#collapsed'] = !variable_get('fivestar_'. $form['#node_type']->type, 0);
+    $form['fivestar']['#description'] = t('To rate this content, enable Fivestar rating below. These settings will be used for both comments (if available) and direct rating.');
+    $form['fivestar']['#theme'] = 'fivestar_node_type_form';
+    $form['fivestar']['#attributes'] = array('id' => 'fivestar-node-type-form');
 
     $form['fivestar']['fivestar'] = array(
       '#type' => 'checkbox',
@@ -1581,8 +1579,8 @@ function fivestar_expand($element) {
   $options = array('-' => t('Select rating'));
   $default_value = $element['#default_value'];
   for ($i = 0; $i <= $element['#stars']; $i++) {
-    $this_value = ceil($i * 100/$element['#stars']);
-    $next_value = ceil(($i+1) * 100/$element['#stars']);
+    $this_value = ($element['#stars'] < 1) ? 0 : ceil($i * 100/$element['#stars']);
+    $next_value = ($element['#stars'] < 1) ? 0 : ceil(($i+1) * 100/$element['#stars']);
 
     // Display clear button only if enabled.
     if ($element['#allow_clear'] == TRUE && $i == 0) {