diff --git a/main/exercise/annotation_user.php b/main/exercise/annotation_user.php
index 3299b70b77..8b290e0d20 100644
--- a/main/exercise/annotation_user.php
+++ b/main/exercise/annotation_user.php
@@ -1,18 +1,21 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use ChamiloSession as Session;
-
-session_cache_limiter("none");
+session_cache_limiter('none');
 
 require_once __DIR__.'/../inc/global.inc.php';
 
 $questionId = isset($_GET['question_id']) ? (int) $_GET['question_id'] : 0;
 $exerciseId = isset($_GET['exe_id']) ? (int) $_GET['exe_id'] : 0;
-$courseId = isset($_GET['exe_id']) ? (int) $_GET['exe_id'] : 0;
+$courseId = isset($_GET['course_id']) ? (int) $_GET['course_id'] : 0;
+$courseInfo = api_get_course_info_by_id($courseId);
+
+if (empty($courseInfo)) {
+    return '';
+}
 
-$objQuestion = Question::read($questionId);
-$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$objQuestion = Question::read($questionId, $courseId);
+$documentPath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
 $picturePath = $documentPath.'/images';
 $pictureSize = getimagesize($picturePath.'/'.$objQuestion->getPictureFilename());
 $pictureWidth = $pictureSize[0];
@@ -35,10 +38,8 @@ $attemptList = Event::getAllExerciseEventByExeId($exerciseId);
 
 if (!empty($attemptList) && isset($attemptList[$questionId])) {
     $questionAttempt = $attemptList[$questionId][0];
-
     if (!empty($questionAttempt['answer'])) {
         $answers = explode('|', $questionAttempt['answer']);
-
         foreach ($answers as $answer) {
             $parts = explode(')(', $answer);
             $type = array_shift($parts);
@@ -46,7 +47,6 @@ if (!empty($attemptList) && isset($attemptList[$questionId])) {
             switch ($type) {
                 case 'P':
                     $points = [];
-
                     foreach ($parts as $partPoint) {
                         $points[] = Geometry::decodePoint($partPoint);
                     }
diff --git a/main/exercise/answer.class.php b/main/exercise/answer.class.php
index e8839125d1..1f73e06edb 100755
--- a/main/exercise/answer.class.php
+++ b/main/exercise/answer.class.php
@@ -1011,9 +1011,11 @@ class Answer
     public function isCorrectByAutoId($needle)
     {
         $key = 0;
-        foreach ($this->autoId as $autoIdKey => $autoId) {
-            if ($autoId == $needle) {
-                $key = $autoIdKey;
+        if (is_array($this->autoId)) {
+            foreach ($this->autoId as $autoIdKey => $autoId) {
+                if ($autoId == $needle) {
+                    $key = $autoIdKey;
+                }
             }
         }
 
diff --git a/main/exercise/exercise_show.php b/main/exercise/exercise_show.php
index 32f9fb82a5..b7cd8ae7f6 100755
--- a/main/exercise/exercise_show.php
+++ b/main/exercise/exercise_show.php
@@ -613,7 +613,7 @@ foreach ($questionList as $questionId) {
 
                 //showing the score
                 $queryfree = "SELECT marks from ".$TBL_TRACK_ATTEMPT." 
-                              WHERE exe_id = ".intval($id)." AND question_id= ".intval($questionId)."";
+                              WHERE exe_id = ".intval($id)." AND question_id= ".intval($questionId);
                 $resfree = Database::query($queryfree);
                 $questionScore = Database::result($resfree, 0, "marks");
                 $totalScore += $questionScore;
@@ -664,7 +664,8 @@ foreach ($questionList as $questionId) {
                         AnnotationQuestion({
                             questionId: '.(int) $questionId.',
                             exerciseId: '.(int) $id.',
-                            relPath: \''.$relPath.'\'
+                            relPath: \''.$relPath.'\',
+                            courseId: '.(int) $courseInfo['real_id'].'
                         });
                     </script>
                 ';
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index 8bb2a8b543..1b00a03345 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -1298,7 +1298,8 @@ HOTSPOT;
                                     AnnotationQuestion({
                                         questionId: '.$questionId.',
                                         exerciseId: '.$exe_id.',
-                                        relPath: \''.$relPath.'\'
+                                        relPath: \''.$relPath.'\',
+                                        courseId: '.$course_id.',
                                     });
                                 </script>
                             </div>
diff --git a/main/inc/lib/javascript/annotation/js/annotation.js b/main/inc/lib/javascript/annotation/js/annotation.js
index 2e48b76d60..8db6b585b2 100644
--- a/main/inc/lib/javascript/annotation/js/annotation.js
+++ b/main/inc/lib/javascript/annotation/js/annotation.js
@@ -337,7 +337,8 @@
             $container = $('#annotation-canvas-' + settings.questionId);
             $.getJSON(settings.relPath + xhrUrl, {
                 question_id: parseInt(settings.questionId),
-                exe_id: parseInt(settings.exerciseId)
+                exe_id: parseInt(settings.exerciseId),
+                course_id: parseInt(settings.courseId)
             })
             .done(function (questionInfo) {
                 var image = new Image();