Index: advpoll.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advpoll/advpoll.module,v
retrieving revision 1.21.2.86
diff -u -p -r1.21.2.86 advpoll.module
--- advpoll.module	15 Dec 2007 21:17:57 -0000	1.21.2.86
+++ advpoll.module	16 Dec 2007 02:07:40 -0000
@@ -661,7 +661,7 @@ function advpoll_validate(&$node) {
       form_set_error('settings][max_choices]', t('Maximum choices must be a non-negative integer.'));
     }
 
-    if ($node->settings['max_choices'] > count($node->choice)) {
+    if ($node->settings['max_choices'] > $real_choices) {
       form_set_error('settings][max_choices]', t('Maximum choices cannot be larger than the number of choices submitted.'));
     }