diff --git a/quiz.module b/quiz.module
index aa61a7e..14ffdde 100644
--- a/quiz.module
+++ b/quiz.module
@@ -416,8 +416,8 @@ function quiz_menu() {
 
   $items['node/%node/results'] = array(
     'title' => 'Results',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('quiz_results_manage_results_form', 1),
+    'page callback' => 'quiz_poll_conflict',
+    'page arguments' => array(1),
     'access arguments' => array(1),
     'access callback' => 'quiz_access_results',
     'type' => MENU_LOCAL_TASK,
@@ -514,6 +514,19 @@ function quiz_menu() {
   return $items;
 }
 
+function quiz_poll_conflict($node)
+{
+  if ($node->type=="quiz")
+  {
+    return drupal_get_form('quiz_results_manage_results_form', $node);
+  }
+  if (($node->type=="poll")&&(module_exists('poll')))
+  {
+    module_load_include('inc', 'poll', 'poll.pages');
+    return poll_results($node);
+  }
+}
+
 /**
  * Implements hook_theme().
  */