Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rc12ef34b74427fd41096a64cb5a8ce44f87eeda2 -r6d6bafd58b27e613ae472097129d2fede445ffd9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision c12ef34b74427fd41096a64cb5a8ce44f87eeda2)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 6d6bafd58b27e613ae472097129d2fede445ffd9)
@@ -1524,13 +1524,14 @@
 	if (!results.isEmpty()) {
 
 	    //prepare list of the questions to display, filtering out questions that aren't supposed to be answered
-	    Set<AssessmentQuestion> questions = new TreeSet<>();
+	    Set<AssessmentQuestion> questions = null;
 	    //in case there is at least one random question - we need to show all questions in a drop down select
 	    if (assessment.hasRandomQuestion()) {
-		questions.addAll(assessment.getQuestions());
+		questions = new TreeSet<>(assessment.getQuestions());
 
 		//otherwise show only questions from the question list
 	    } else {
+		questions = new LinkedHashSet<>();
 		for (QuestionReference reference : assessment.getQuestionReferences()) {
 		    questions.add(reference.getQuestion());
 		}