Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r567af22fafd6a56534cc071f3650eda4495d05ef -ra251a980cfb285d985de39d6fe46e32eba7ad852
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 567af22fafd6a56534cc071f3650eda4495d05ef)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision a251a980cfb285d985de39d6fe46e32eba7ad852)
@@ -464,7 +464,7 @@
 	    }
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER) {
 	    for (AssessmentQuestionOption option : question.getQuestionOptions()) {
-		String optionString = option.getOptionString().replaceAll("\\*", ".*");
+		String optionString = option.getOptionString().trim().replaceAll("\\*", ".*");
 		Pattern pattern;
 		if (question.isCaseSensitive()) {
 		    pattern = Pattern.compile(optionString);
@@ -473,7 +473,7 @@
 			    | java.util.regex.Pattern.UNICODE_CASE);
 		}
 		boolean isAnswerCorrect = (question.getAnswerString() != null) ? pattern.matcher(
-			question.getAnswerString()).matches() : false;
+			question.getAnswerString().trim()).matches() : false;
 
 		if (isAnswerCorrect) {
 		    mark = option.getGrade() * maxMark;