Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r8853aed83e14eb0e9c29c5af3c856bdc90ea0668 -r899c6912c8a159c4aaab1d37d64500ba0b191a8e
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 8853aed83e14eb0e9c29c5af3c856bdc90ea0668)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 899c6912c8a159c4aaab1d37d64500ba0b191a8e)
@@ -1499,11 +1499,11 @@
 		int answerCount = 1;
 		for (OptionDTO answer : item.getOptionDtos()) {
 		    if (answer.isCorrect()) {
-			correctAnswerLetter = String.valueOf((char) ((answerCount + 'A') - 1));
-			break;
+			correctAnswerLetter += ((char) ((answerCount + 'A') - 1)) + " ";
 		    }
 		    answerCount++;
 		}
+		correctAnswerLetter = correctAnswerLetter.trim().replace(" ", ", ");
 
 	    } else {
 		List<QbOption> options = item.getQbQuestion().getQbOptions();
@@ -2206,7 +2206,7 @@
 
 		    OptionDTO optionDto = new OptionDTO();
 		    optionDto.setAnswer(optionLetter);
-		    optionDto.setCorrect(correctOptionLetter.equals(optionLetter));
+		    optionDto.setCorrect(correctOptionLetter.contains(optionLetter));
 		    optionDtos.add(optionDto);
 		}