--- C:/Documents and Settings/jjr/Desktop/quiz/quiz.module	Sun Sep 12 03:40:40 2010
+++ H:/My Documents/Sites/stowers/sites/all/modules/quiz/quiz.module	Mon Nov 15 14:02:29 2010
@@ -2457,9 +2457,12 @@
 
   // Get required questions first.
   $sql = "SELECT child_nid as nid, child_vid as vid, max_score as relative_max_score
-    FROM {quiz_node_relationship}
+    FROM {quiz_node_relationship} qnr INNER JOIN {node} n ON qnr.child_nid = n.nid
     WHERE parent_vid = %d
       AND question_status = %d
+      AND type IN ('"
+      . implode("','", array_keys(_quiz_get_question_types()))
+      . "')
     ORDER BY weight";
   $result = db_query($sql, $quiz->vid, QUESTION_ALWAYS);
   while ($question_node = db_fetch_array($result)) {
@@ -2480,6 +2483,7 @@
   if ($quiz->randomization > 0) {
     shuffle($questions);
   }
+
   return $questions;
 }
 
@@ -3605,9 +3609,13 @@
  *   Number of compulsory questions.
  */
 function _quiz_get_num_always_questions($vid) {
-  $sql = 'SELECT count(*) 
-          FROM {quiz_node_relationship}
-          WHERE parent_vid = %d AND question_status = %d';
+  $sql = "SELECT count(*) 
+          FROM {quiz_node_relationship} qnr INNER JOIN {node} n ON qnr.child_nid = n.nid
+          WHERE parent_vid = %d 
+          AND question_status = %d
+          AND type IN ('"
+          . implode("','", array_keys(_quiz_get_question_types()))
+          . "')";
   return db_result(db_query($sql, $vid, QUESTION_ALWAYS));
 }