Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
@@ -66,7 +66,7 @@
 					<c:otherwise>
 						<c:set var="buttonLabel">
 							<c:choose>
-								<c:when test="${sessionMap.activityPosition.last}">
+								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="label.submit" />
 								</c:when>
 
@@ -206,7 +206,7 @@
 						<button type="submit" id="finishButton" onclick="return finishSession()"
 							class="btn btn-sm btn-primary pull-right na">
 							<c:choose>
-								<c:when test="${sessionMap.activityPosition.last}">
+								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="label.submit" />
 								</c:when>