Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u -r21606f18aac597a4f64d761bd0e33e904e35a997 -re3136dd4e77147264c67ef312cdb8543dbf9ecde
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 21606f18aac597a4f64d761bd0e33e904e35a997)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision e3136dd4e77147264c67ef312cdb8543dbf9ecde)
@@ -105,9 +105,14 @@
     private static final String MERGE_QUESTION_ANSWERS = "UPDATE lams_qb_tool_answer AS tas "
 	    + "JOIN lams_qb_option AS os ON os.qb_question_uid = :sourceQbQuestionUid AND tas.qb_option_uid = os.uid "
 	    + "JOIN lams_qb_option AS ot ON ot.qb_question_uid = :targetQbQuestionUid AND os.display_order = ot.display_order "
-	    + "LEFT JOIN tl_laasse10_option_answer AS aa ON aa.question_option_uid = os.uid "
-	    + "SET tas.qb_option_uid       = ot.uid, " + "    aa.question_option_uid  = ot.uid";
+	    + "SET tas.qb_option_uid = ot.uid";
 
+    private static final String MERGE_ASSESSMENT_ANSWERS = "UPDATE lams_qb_option AS os "
+	    + "JOIN lams_qb_option AS ot ON os.qb_question_uid = :sourceQbQuestionUid AND ot.qb_question_uid = :targetQbQuestionUid "
+	    + "AND os.display_order = ot.display_order "
+	    + "JOIN tl_laasse10_option_answer AS aa ON aa.question_option_uid = os.uid "
+	    + "SET aa.question_option_uid = ot.uid";
+
     @Override
     public QbQuestion getQuestionByUid(Long qbQuestionUid) {
 	return this.find(QbQuestion.class, qbQuestionUid);
@@ -418,6 +423,10 @@
 		.setParameter("sourceQbQuestionUid", sourceQbQUestionUid)
 		.setParameter("targetQbQuestionUid", targetQbQuestionUid).executeUpdate();
 
+	result += getSession().createNativeQuery(MERGE_ASSESSMENT_ANSWERS)
+		.setParameter("sourceQbQuestionUid", sourceQbQUestionUid)
+		.setParameter("targetQbQuestionUid", targetQbQuestionUid).executeUpdate();
+
 	getSession().createQuery(MERGE_TOOL_QUESTIONS).setParameter("sourceQbQuestionUid", sourceQbQUestionUid)
 		.setParameter("targetQbQuestionUid", targetQbQuestionUid).executeUpdate();