Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
===================================================================
diff -u -r50f84b60c632e10ccc6981f1ce142e28b23eb44c -r594d93694800975ab84a9b61190aa8a65a057077
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 50f84b60c632e10ccc6981f1ce142e28b23eb44c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 594d93694800975ab84a9b61190aa8a65a057077)
@@ -117,15 +117,16 @@
 	    QbQuestion qbQuestion = new QbQuestion();
 	    qbQuestion.setUuid(uuid);
 	    qbQuestion.setName(question.getTitle());
-	    qbQuestion.setDescription(QuestionParser.processHTMLField(question.getText(), false, contentFolderID,
-		    question.getResourcesFolderPath()));
-	    qbQuestion.setFeedback(QuestionParser.processHTMLField(question.getFeedback(), false, contentFolderID,
-		    question.getResourcesFolderPath()));
+	    qbQuestion.setContentFolderId(
+		    StringUtils.isBlank(contentFolderID) ? FileUtil.generateUniqueContentFolderID() : contentFolderID);
+	    qbQuestion.setDescription(QuestionParser.processHTMLField(question.getText(), false,
+		    qbQuestion.getContentFolderId(), question.getResourcesFolderPath()));
+	    qbQuestion.setFeedback(QuestionParser.processHTMLField(question.getFeedback(), false,
+		    qbQuestion.getContentFolderId(), question.getResourcesFolderPath()));
 	    qbQuestion.setPenaltyFactor(0);
 	    int questionId = qbService.generateNextQuestionId();
 	    qbQuestion.setQuestionId(questionId);
 	    qbQuestion.setVersion(1);
-	    qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
 
 	    int questionMark = 1;