Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r7dc409ffd76dcebc2d210a3a128cdcbba171ff33
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 7dc409ffd76dcebc2d210a3a128cdcbba171ff33)
@@ -56,7 +56,6 @@
     @ResponseBody
     public void saveQTI(HttpServletRequest request, @RequestParam long collectionUid,
 	    @RequestParam String contentFolderID) throws UnsupportedEncodingException {
-	int questionId = qbService.generateNextQuestionId();
 
 	Question[] questions = QuestionParser.parseQuestionChoiceForm(request);
 	for (Question question : questions) {
@@ -67,7 +66,9 @@
 	    qbQuestion.setFeedback(QuestionParser.processHTMLField(question.getFeedback(), false, contentFolderID,
 		    question.getResourcesFolderPath()));
 	    qbQuestion.setPenaltyFactor(0);
+	    int questionId = qbService.generateNextQuestionId();
 	    qbQuestion.setQuestionId(questionId);
+	    qbQuestion.setVersion(1);
 
 	    int questionMark = 1;
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r7dc409ffd76dcebc2d210a3a128cdcbba171ff33
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java	(.../XmlQuestionsController.java)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java	(.../XmlQuestionsController.java)	(revision 7dc409ffd76dcebc2d210a3a128cdcbba171ff33)
@@ -62,8 +62,6 @@
     @ResponseBody
     public void importQuestionsXml(@RequestParam("UPLOAD_FILE") MultipartFile file, HttpServletRequest request,
 	    @RequestParam long collectionUid) throws ServletException {
-	int questionId = qbService.generateNextQuestionId();
-
 	List<String> toolsErrorMsgs = new ArrayList<>();
 	try {
 	    String uploadPath = FileUtil.createTempDirectory("_uploaded_2questions_xml");
@@ -77,14 +75,15 @@
 	    if (!fileExtension.equalsIgnoreCase("xml")) {
 		throw new RuntimeException("Wrong file extension. Xml is expected");
 	    }
-	    // String learningDesignPath = ZipFileUtil.expandZip(new FileInputStream(designFile), filename2);
-
+	    
 	    // import learning design
-	    String fullFilePath = destinationFile.getAbsolutePath();// FileUtil.getFullPath(learningDesignPath,
-	    // ExportToolContentService.LEARNING_DESIGN_FILE_NAME);
+	    String fullFilePath = destinationFile.getAbsolutePath();
+	    // String learningDesignPath = ZipFileUtil.expandZip(new FileInputStream(designFile), filename2);
+	    // FileUtil.getFullPath(learningDesignPath, ExportToolContentService.LEARNING_DESIGN_FILE_NAME);
 	    List<QbQuestion> questions = (List<QbQuestion>) FileUtil.getObjectFromXML(null, fullFilePath);
 	    if (questions != null) {
 		for (QbQuestion qbQuestion : questions) {
+		    int questionId = qbService.generateNextQuestionId();
 		    qbQuestion.setQuestionId(questionId);
 		    qbQuestion.setCreateDate(new Date());
 		    userManagementService.save(qbQuestion);