diff --git a/classes/local/repository/questions_repository.php b/classes/local/repository/questions_repository.php
index ec0adcb3..aed7539a 100644
--- a/classes/local/repository/questions_repository.php
+++ b/classes/local/repository/questions_repository.php
@@ -84,12 +84,12 @@ public static function count_questions_number_per_difficulty(array $tagidlist, a
             JOIN {question} q ON q.id = ti.itemid
             JOIN {question_versions} qv ON qv.questionid = q.id
             JOIN (
-                SELECT questionbankentryid, MAX(version)
+                SELECT questionbankentryid, MAX(version) latestversion
                 FROM {question_versions}
                 WHERE status = ?
                 GROUP BY questionbankentryid
-            ) questionlatestversion ON questionlatestversion.questionbankentryid = qv.questionbankentryid
-            JOIN {question_bank_entries} qbe ON qbe.id = questionlatestversion.questionbankentryid
+            ) queslatver ON queslatver.questionbankentryid = qv.questionbankentryid AND qv.version = queslatver.latestversion
+            JOIN {question_bank_entries} qbe ON qbe.id = queslatver.questionbankentryid
             WHERE ti.itemtype = ?
             AND ti.tagid {$tagidlistsql}
             AND qbe.questioncategoryid {$categoryidlistsql}