Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java
===================================================================
diff -u -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 -r2c5cff11b67aacf7cef0f89a33733702bdcda0cd
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java	(.../SurveyCondition.java)	(revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java	(.../SurveyCondition.java)	(revision 2c5cff11b67aacf7cef0f89a33733702bdcda0cd)
@@ -30,9 +30,9 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
-import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.SortComparator;
 import org.lamsfoundation.lams.learningdesign.BranchCondition;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.TextSearchCondition;
@@ -57,7 +57,7 @@
      */
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(name = "tl_lasurv11_condition_questions", joinColumns = @JoinColumn(name = "condition_id"), inverseJoinColumns = @JoinColumn(name = "question_uid"))
-    @OrderBy("question_uid")
+    @SortComparator(QuestionsComparator.class)
     private Set<SurveyQuestion> questions = new TreeSet<SurveyQuestion>(new QuestionsComparator());
 
     public SurveyCondition() {