diff --git a/quiz.module b/quiz.module
index 0294fec..240bff5 100644
--- a/quiz.module
+++ b/quiz.module
@@ -3008,8 +3008,8 @@ function _quiz_build_categorized_question_list($quiz) {
     }
     $total_count += $count;
     if ($count < $term->number) {
-      // Not enough questions
-      return FALSE;
+      // Not enough questions, set number of questions to the real number
+      $term->number = $count;
     }
   }
   return $questions;