Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java,v
diff -u -r1.11.6.2 -r1.11.6.3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	28 Sep 2011 20:59:38 -0000	1.11.6.2
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	29 Sep 2011 13:43:36 -0000	1.11.6.3
@@ -162,7 +162,7 @@
 
 	final AssessmentQuestion genericEntity = (AssessmentQuestion) o;
 
-	return new EqualsBuilder().append(this.getUid(), genericEntity.getUid()).isEquals();
+	return new EqualsBuilder().append(this.getUid(), genericEntity.getUid()).append(this.getSequenceId(), genericEntity.getSequenceId()).isEquals();
     }
     
     @Override
@@ -182,7 +182,7 @@
 
     @Override
     public int hashCode() {
-	return new HashCodeBuilder().append(getUid()).toHashCode();
+	return new HashCodeBuilder().append(getUid()).append(getSequenceId()).toHashCode();
     }
 
     // **********************************************************
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/QuestionReference.hbm.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml	28 Sep 2011 20:59:38 -0000	1.1.2.2
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml	29 Sep 2011 13:43:35 -0000	1.1.2.3
@@ -28,7 +28,7 @@
         <many-to-one
             name="question"
             class="org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion"
-            cascade="all"
+            cascade="save-update"
             outer-join="auto"
             update="true"
             insert="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java	28 Sep 2011 20:59:38 -0000	1.1.2.2
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java	29 Sep 2011 13:43:36 -0000	1.1.2.3
@@ -91,7 +91,7 @@
     }
     
     /**
-     * @hibernate.many-to-one cascade="all" column="question_uid"
+     * @hibernate.many-to-one cascade="save-update" column="question_uid"
      * 
      * @return
      */
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.14.6.6 -r1.14.6.7
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	16 Sep 2011 16:59:54 -0000	1.14.6.6
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	29 Sep 2011 13:43:36 -0000	1.14.6.7
@@ -151,22 +151,25 @@
 
 	Assessment assessment = service.getAssessmentBySessionId(toolSessionId);
 	
-	//replacing random questions with real ones
+	
 	Set<QuestionReference> questionReferences = assessment.getQuestionReferences();
 	Set<AssessmentQuestion> questionsFromDB = new LinkedHashSet<AssessmentQuestion>();
+	//add non-random questions
 	for (QuestionReference questionReference : questionReferences) {
 	    if (!questionReference.isRandomQuestion()) {
 		questionsFromDB.add(questionReference.getQuestion());
 	    }
 	}
 	Set<AssessmentQuestion> allQuestions = assessment.getQuestions();
 	Collection<AssessmentQuestion> availableQuestions = CollectionUtils.subtract(allQuestions, questionsFromDB);
+	//add random questions (actually replacing them with real ones)
 	for (QuestionReference questionReference : questionReferences) {
 	    if (questionReference.isRandomQuestion()) {
 		//pick a random element
 		Random rand = new Random(System.currentTimeMillis());
 		AssessmentQuestion question = (AssessmentQuestion) availableQuestions.toArray()[rand.nextInt(availableQuestions.size())];
 		questionsFromDB.add(question);
+		availableQuestions.remove(question);
 	    }
 	}