Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r56d2beec79da1fb5b048021a044439e6498e939b -r7a06b75af5f08854848a931748f2d447d7977c04
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 56d2beec79da1fb5b048021a044439e6498e939b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 7a06b75af5f08854848a931748f2d447d7977c04)
@@ -1681,8 +1681,11 @@
 
 	    sessionIdToUsersMap.put(sessionId, users);
 	}
+	Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
+	questionReferences.addAll(assessment.getQuestionReferences());
 
-	for (AssessmentQuestion question : assessment.getQuestions()) {
+	for (QuestionReference questionReference : questionReferences) {
+	    AssessmentQuestion question = questionReference.getQuestion();
 	    Long questionUid = question.getUid();
 	    QuestionSummary questionSummary = new QuestionSummary(question);