Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
===================================================================
diff -u -ref86b1a497acdbc249c66c78e59d542ded3044c0 -ra2a36ce7bc346fb2775998134f5f5ea3a9391698
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision ef86b1a497acdbc249c66c78e59d542ded3044c0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision a2a36ce7bc346fb2775998134f5f5ea3a9391698)
@@ -582,6 +582,9 @@
 	if (qbQuestion.getQuestionId() == null) {
 	    qbQuestion.setQuestionId(generateNextQuestionId());
 	}
+	if (qbQuestion.getVersion() == null) {
+	    qbQuestion.setVersion(1);
+	}
 
 	Collection<QbOption> qbOptions = qbQuestion.getQbOptions() == null ? null
 		: new ArrayList<>(qbQuestion.getQbOptions());
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -ra2a36ce7bc346fb2775998134f5f5ea3a9391698
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision a2a36ce7bc346fb2775998134f5f5ea3a9391698)
@@ -70,6 +70,7 @@
 	try {
 	    item = (ScratchieItem) super.clone();
 	    item.uid = null;
+	    item.scratchieUid = null;
 	} catch (CloneNotSupportedException e) {
 	    log.error("When clone " + ScratchieItem.class + " failed");
 	}