Index: lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
===================================================================
diff -u -r17f106d9b03871e7278c6eb87f793193d8ff0908 -raf4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55
--- lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision 17f106d9b03871e7278c6eb87f793193d8ff0908)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision af4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55)
@@ -69,7 +69,7 @@
 
     // can be anything
     private static final String TEMP_PACKAGE_NAME_PREFIX = "QTI_PACKAGE_";
-    private static final Pattern IMAGE_PATTERN = Pattern.compile("\\[IMAGE: (.*)\\]");
+    private static final Pattern IMAGE_PATTERN = Pattern.compile("\\[IMAGE: ([^\\]]+)\\]");
 
     public static final String UUID_LABEL_PREFIX = "lams-qb-uuid-";
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
===================================================================
diff -u -r02ce40b60524aa33d326fbda824dcd43f566ab94 -raf4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 02ce40b60524aa33d326fbda824dcd43f566ab94)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision af4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55)
@@ -89,7 +89,7 @@
 
     @Autowired
     @Qualifier("lamcMessageService")
-    private static MessageService messageService;
+    private MessageService messageService;
 
     @RequestMapping("/displayMc")
     public String displayMc(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
===================================================================
diff -u -r9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44 -raf4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java	(.../McPedagogicalPlannerController.java)	(revision 9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java	(.../McPedagogicalPlannerController.java)	(revision af4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55)
@@ -60,7 +60,7 @@
 
     @Autowired
     @Qualifier("lamcMessageService")
-    private static MessageService messageService;
+    private MessageService messageService;
 
     protected String unspecified(@ModelAttribute McPedagogicalPlannerForm plannerForm, HttpServletRequest request) {
 	return initPedagogicalPlannerForm(plannerForm, request);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
===================================================================
diff -u -r9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44 -raf4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java	(.../McPedagogicalPlannerForm.java)	(revision 9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java	(.../McPedagogicalPlannerForm.java)	(revision af4e1c770ec77e97fa3d30f3bc4dbd95e5ab9f55)
@@ -51,7 +51,7 @@
 
     @Autowired
     @Qualifier("lamcMessageService")
-    private static MessageService messageService;
+    private MessageService messageService;
 
     private List<String> descriptions;
     private List<Integer> candidateAnswerCount;