diff --git a/Modules/TestQuestionPool/classes/class.assClozeTestGUI.php b/Modules/TestQuestionPool/classes/class.assClozeTestGUI.php
index 9cc3d3fb4002..c3c036a2185a 100755
--- a/Modules/TestQuestionPool/classes/class.assClozeTestGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assClozeTestGUI.php
@@ -986,7 +986,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assErrorTextGUI.php b/Modules/TestQuestionPool/classes/class.assErrorTextGUI.php
index 175a2117d2b8..e2c7d4c2fe3c 100644
--- a/Modules/TestQuestionPool/classes/class.assErrorTextGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assErrorTextGUI.php
@@ -281,7 +281,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assFormulaQuestionGUI.php b/Modules/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
index 78c7fbbd1376..d0d66020c842 100755
--- a/Modules/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
@@ -840,7 +840,7 @@ static function (array $c, assFormulaQuestionVariable $v): array {
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assImagemapQuestionGUI.php b/Modules/TestQuestionPool/classes/class.assImagemapQuestionGUI.php
index 51baa39a1124..0292c3f49ac7 100755
--- a/Modules/TestQuestionPool/classes/class.assImagemapQuestionGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assImagemapQuestionGUI.php
@@ -480,7 +480,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php b/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php
index 70aaaa460a90..599c0af215bb 100644
--- a/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php
@@ -603,7 +603,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assLongMenuGUI.php b/Modules/TestQuestionPool/classes/class.assLongMenuGUI.php
index 3179fd31ca04..50083af15723 100644
--- a/Modules/TestQuestionPool/classes/class.assLongMenuGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assLongMenuGUI.php
@@ -376,7 +376,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assMatchingQuestionGUI.php b/Modules/TestQuestionPool/classes/class.assMatchingQuestionGUI.php
index d3ec8b8c8e4e..018a0e4696a9 100755
--- a/Modules/TestQuestionPool/classes/class.assMatchingQuestionGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assMatchingQuestionGUI.php
@@ -499,7 +499,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assMultipleChoiceGUI.php b/Modules/TestQuestionPool/classes/class.assMultipleChoiceGUI.php
index 5f5862fbea41..8295abfdb5f3 100755
--- a/Modules/TestQuestionPool/classes/class.assMultipleChoiceGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assMultipleChoiceGUI.php
@@ -258,7 +258,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assNumericGUI.php b/Modules/TestQuestionPool/classes/class.assNumericGUI.php
index 43161ed3d28b..17694c291dc6 100755
--- a/Modules/TestQuestionPool/classes/class.assNumericGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assNumericGUI.php
@@ -210,7 +210,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assOrderingHorizontalGUI.php b/Modules/TestQuestionPool/classes/class.assOrderingHorizontalGUI.php
index 9033a917a244..10d79599defe 100644
--- a/Modules/TestQuestionPool/classes/class.assOrderingHorizontalGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assOrderingHorizontalGUI.php
@@ -165,7 +165,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assOrderingQuestionGUI.php b/Modules/TestQuestionPool/classes/class.assOrderingQuestionGUI.php
index 593c4453040c..4a178bd9f3e0 100755
--- a/Modules/TestQuestionPool/classes/class.assOrderingQuestionGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assOrderingQuestionGUI.php
@@ -479,7 +479,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assSingleChoiceGUI.php b/Modules/TestQuestionPool/classes/class.assSingleChoiceGUI.php
index c640769f0ce3..e1b4e89f5181 100755
--- a/Modules/TestQuestionPool/classes/class.assSingleChoiceGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assSingleChoiceGUI.php
@@ -283,7 +283,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assTextQuestionGUI.php b/Modules/TestQuestionPool/classes/class.assTextQuestionGUI.php
index e3f4f0153170..1b75d29979fe 100755
--- a/Modules/TestQuestionPool/classes/class.assTextQuestionGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assTextQuestionGUI.php
@@ -183,7 +183,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,
diff --git a/Modules/TestQuestionPool/classes/class.assTextSubsetGUI.php b/Modules/TestQuestionPool/classes/class.assTextSubsetGUI.php
index 03d467358a4e..0142a4c93b9a 100755
--- a/Modules/TestQuestionPool/classes/class.assTextSubsetGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assTextSubsetGUI.php
@@ -201,7 +201,7 @@ public function getSolutionOutput(
     public function renderSolutionOutput(
         mixed $user_solutions,
         int $active_id,
-        int $pass,
+        ?int $pass,
         bool $graphical_output = false,
         bool $result_output = false,
         bool $show_question_only = true,