diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 7bceb3340f1..12e74a15c83 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -528,8 +528,7 @@ function choice_show_results($choice, $course, $cm, $allresponses, $forcepublish
echo $columncount[$optionid];
echo "
";
echo get_string("limit", "choice").":";
- $choice_option = $DB->get_record("choice_options", array("id" => $optionid));
- echo $choice_option->maxanswers;
+ echo $choice->maxanswers[$optionid];
} else {
if (isset($columncount[$optionid])) {
echo $columncount[$optionid];
@@ -634,8 +633,7 @@ function choice_show_results($choice, $course, $cm, $allresponses, $forcepublish
echo get_string("taken", "choice").":";
echo $column[$optionid].'
';
echo get_string("limit", "choice").":";
- $choice_option = $DB->get_record("choice_options", array("id" => $optionid));
- echo $choice_option->maxanswers;
+ echo $choice->maxanswers[$optionid];
} else {
echo $column[$optionid];
echo '
('.format_float(((float)$column[$optionid]/(float)$totalresponsecount)*100.0,1).'%)';