diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/gapFill.html b/modules/xerte/parent_templates/Nottingham/models_html5/gapFill.html
index 87d7c5dce..3f968f02e 100644
--- a/modules/xerte/parent_templates/Nottingham/models_html5/gapFill.html
+++ b/modules/xerte/parent_templates/Nottingham/models_html5/gapFill.html
@@ -56,7 +56,7 @@
 			score = $pageContents.data('score');
 			attempts = $pageContents.data('attempts');
 			
-			if (XTGetMode() == "normal") { this.isTracked = true; };
+			if (XTGetMode() == "normal") { this.isTracked = true; }
 			
 			$pageContents.find("#hint").remove();
 		}
@@ -1173,20 +1173,20 @@
 					for (var interactionNumber = 0; interactionNumber < answerData.length; interactionNumber++) {
 						var correctAnswer = answerData[interactionNumber][0];
 						var labelSource = labelAnswers[correctAnswer];
-						var option = {source: labelSource, target: correctAnswer};
+						var option = {source: labelSource, target: interactionNumber};
 						l_options.push(option);
-						if (option.source == option.target) {
+						if (correctAnswer == labelSource) {
 							correct_answers++;
 						}
 
-						var l_answer = labelSource + "-->" + correctAnswer;
+						var l_answer = labelSource + "-->" + interactionNumber;
 						l_answers.push(l_answer);
 						total++;
 					}
-					var correct = (total == correct_answers);
-					var result = {
+					const correct = (total == correct_answers);
+					const result = {
 						success: correct,
-						score: (correct ? 100.0 : 0.0)
+						score: (correct_answers * 100.0)/total
 					};
 					if (!correct) { feedback = "Incorrect"; }