diff --git a/main/exercice/export/scorm/scorm_classes.php b/main/exercice/export/scorm/scorm_classes.php
index d11a2c27a8..f9f5857055 100755
--- a/main/exercice/export/scorm/scorm_classes.php
+++ b/main/exercice/export/scorm/scorm_classes.php
@@ -202,7 +202,7 @@ class ScormAnswerMultipleChoice extends Answer
 		    	$id++;
 			}
 			$js .= 'questions_answers['.$this->questionId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionId.'] = new Array('.$jstmpc.');'."\n";
+	    	$js .= 'questions_answers_correct['.$this->questionId.'] = '.$jstmpc.';'."\n";
 	    	$js .= 'questions_types['.$this->questionId.'] = \'mcua\';'."\n";
         }
 		$html .= '</table></td></tr>' . "\n";
@@ -297,13 +297,15 @@ class ScormAnswerFillInBlanks extends Answer
 		// because [] is parsed here we follow this procedure:
 		// 1. find everything between the [ and ] tags
 		$i=1;
+		$jstmp = '';
 		$jstmpc = '';
 		$startlocations=strpos($answer,'[');
 		$endlocations=strpos($answer,']');
 		while($startlocations !== false && $endlocations !== false)
 		{
 			$texstring=substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = substr_replace($answer,'<input type="text" name="choice_'.$this->questionId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+			$answer = substr_replace($answer,'<input type="text" name="question_'.$this->questionId.'_fib_'.$i.'" id="question_'.$this->questionId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+			$jstmp .= $i.',';
 			$jstmpc .= "'".htmlentities(substr($texstring,1,-1),ENT_QUOTES)."',";			
 			$i++;
 			$startlocations=strpos($answer,'[');
@@ -316,7 +318,7 @@ class ScormAnswerFillInBlanks extends Answer
 	    		.	'</td>' . "\n"
 	    		.	'</tr>' . "\n";
 		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionId.'] = new Array();'."\n";
+		$js .= 'questions_answers['.$this->questionId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
     	$js .= 'questions_answers_correct['.$this->questionId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
     	$js .= 'questions_types['.$this->questionId.'] = \'fib\';'."\n";
         return array($js,$html);
@@ -356,7 +358,7 @@ class ScormAnswerMatching extends Answer
 		$jstmpc = '';
 		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
 		{
-			$identifier = 'question_'.$qId.'_matching_'.$answerId;
+			$identifier = 'question_'.$qId.'_matching_';
 			$answer=$this->selectAnswer($answerId);
 			$answerCorrect=$this->isCorrect($answerId);
 			$weight=$this->selectWeighting($answerId);
@@ -374,7 +376,7 @@ class ScormAnswerMatching extends Answer
 			{
 				$s.='<tr>'."\n";
 				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.'">';
+				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
 				$s.=' <option value="0">--</option>';
 	            // fills the list-box
 	            foreach($Select as $key=>$val)
@@ -389,7 +391,7 @@ class ScormAnswerMatching extends Answer
 				$s.="</td>\n</tr>\n";
 	
 				$jstmp  .= $cpt2.',';
-				$jstmpc .= '['.$cpt2.',\''.$Select[$cpt2]['Lettre'].'\'],';
+				$jstmpc .= '['.$cpt2.',\''.$cpt2.'\'],';
 				$cpt2++;
 	
 				// if the left side of the "matching" has been completely shown
@@ -581,10 +583,17 @@ class ScormAnswerHotspot extends Answer
 					</script>";
 			//because this header closes so many times the <script> tag, we have to reopen our own
 			$header .= '<script type="text/javascript" language="javascript">'."\n";
+			$header .= 'questions_answers['.$this->questionId.'] = new Array();'."\n";
+    		$header .= 'questions_answers_correct['.$this->questionId.'] = new Array();'."\n";
+    		$header .= 'questions_types['.$this->questionId.'] = \'hotspot\';'."\n";
+			
 		}
 		else
 		{
 			$header = '';
+			$header .= 'questions_answers['.$this->questionId.'] = new Array();'."\n";
+    		$header .= 'questions_answers_correct['.$this->questionId.'] = new Array();'."\n";
+    		$header .= 'questions_types['.$this->questionId.'] = \'hotspot\';'."\n";
 		}
 		return $header;
 	}
diff --git a/main/newscorm/js/api_wrapper.js b/main/newscorm/js/api_wrapper.js
index 041c501da7..cf6cf6f2e1 100644
--- a/main/newscorm/js/api_wrapper.js
+++ b/main/newscorm/js/api_wrapper.js
@@ -429,9 +429,16 @@ function checkAnswers(interrupted)
 				{
 					var idAnswer = questions_answers[idQuestion][j];
 					var answer = document.getElementById('question_'+(idQuestion)+'_multiple_'+(idAnswer));
-					if(answer.checked.value == true)
+					if(answer.checked == true)
 					{
-						myScore += questions_answers_correct[idQuestion][idAnswer];
+						interactionAnswers += idAnswer+',';
+						for(k=0;k<questions_answers_correct[idQuestion].length;k++)
+						{
+							if(questions_answers_correct[idQuestion][k] == idAnswer)
+							{
+								myScore ++;
+							}
+						}
 					}
 				}
 				interactionScore = myScore;
@@ -448,9 +455,13 @@ function checkAnswers(interrupted)
 				{
 					var idAnswer = questions_answers[idQuestion][j];
 					var answer = document.getElementById('question_'+(idQuestion)+'_unique_'+(idAnswer));
-					if(answer.checked.value == true)
+					if(answer.checked == true)
 					{
-						myScore += questions_answers_correct[idQuestion][idAnswer];
+						interactionAnswers += idAnswer;
+						if(questions_answers_correct[idQuestion] == idAnswer)
+						{
+							myScore ++;
+						}
 					}
 				}
 				interactionScore = myScore;
@@ -466,7 +477,14 @@ function checkAnswers(interrupted)
 					var answer = document.getElementById('question_'+(idQuestion)+'_tf_'+(idAnswer));
 					if(answer.checked.value == true)
 					{
-						myScore += questions_answers_correct[idQuestion][idAnswer];
+						interactionAnswers += idAnswer;
+						for(k=0;k<questions_answers_correct[idQuestion].length;k++)
+						{
+							if(questions_answers_correct[idQuestion][k] == idAnswer)
+							{
+								myScore ++;
+							}
+						}
 					}
 				}
 				interactionScore = myScore;
@@ -480,11 +498,17 @@ function checkAnswers(interrupted)
 				{
 					var idAnswer = questions_answers[idQuestion][j];
 					var answer = document.getElementById('question_'+(idQuestion)+'_fib_'+(idAnswer));
-					if(answer.value == questions_answers_correct[idQuestion][idAnswer])
+					if(answer.value)
 					{
-						myScore += 1;
+						interactionAnswers += answer.value+',';
+						for(k=0;k<questions_answers_correct[idQuestion].length;k++)
+						{
+							if(questions_answers_correct[idQuestion][k] == answer.value)
+							{
+								myScore ++;
+							}
+						}
 					}
-					interactionAnswers += answer.value+',';
 				}
 				interactionScore = myScore;
 				//correct responses work by pattern, see SCORM Runtime Env Doc
@@ -495,8 +519,25 @@ function checkAnswers(interrupted)
 			}
 			else if(type == 'matching')
 			{
-				//
-				interactionScore = 0;
+				var myScore = 0;
+				for(var j=0; j<questions_answers[idQuestion].length;j++)
+				{
+					var idAnswer = questions_answers[idQuestion][j];
+					var answer = document.getElementById('question_'+(idQuestion)+'_matching_'+(idAnswer));
+					if(answer && answer.value)
+					{
+						interactionAnswers += answer.value+',';
+						for(k=0;k<questions_answers_correct[idQuestion].length;k++)
+						{
+							var left = questions_answers_correct[idQuestion][k][0];
+							var right = questions_answers_correct[idQuestion][k][1];
+							if(left == idAnswer && right == answer.value)
+							{
+								myScore ++;
+							}
+						}
+					}
+				}
 				//correct responses work by pattern, see SCORM Runtime Env Doc
 				//for(k=0;k<questions_answers_correct[idQuestion].length;k++)
 				//{
@@ -506,14 +547,16 @@ function checkAnswers(interrupted)
 			else if(type == 'free')
 			{
 				interactionScore = 0;
-				interactionAnswers = document.getElementById('question_'+(idQuestion)+'_free').innerHTML;
+				interactionAnswers = document.getElementById('question_'+(idQuestion)+'_free').value;
 				//correct responses work by pattern, see SCORM Runtime Env Doc
 				//interactionCorrectResponses += questions_answers_correct[idQuestion].toString();
 			}
 			else if(type == 'hotspot')
 			{
-				//
-				interactionScore = 0;
+				//if(question_score && question_score[idQuestion]){
+				//	interactionScore = question_score[idQuestion];
+				//} //else, 0
+				
 				//interactionAnswers = document.getElementById('question_'+(idQuestion)+'_free').innerHTML;
 				interactionAnswers = '';
 				//correct responses work by pattern, see SCORM Runtime Env Doc