diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php
index cbc617eea8..675c7f1803 100755
--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@@ -1308,7 +1308,7 @@ if (!empty($student_id)) {
         }
 
         require_once '../work/work.lib.php';
-        $userworks = getWorkPerUser($student_id, $courseInfo['real_id'], $sessionId);
+        $userWorks = getWorkPerUser($student_id, $courseInfo['real_id'], $sessionId);
         echo '
             <div class="table-responsive">
                 <table class="table table-striped table-hover">
@@ -1324,44 +1324,43 @@ if (!empty($student_id)) {
                     </thead>
                     <tbody>
         ';
+        $workingTime = api_get_configuration_value('considered_working_time');
+        foreach ($userWorks as $work) {
+            $work = $work['work'];
+            foreach ($work->user_results as $key => $results) {
+                echo '<tr>';
+                echo '<td>' . $work->title . '</td>';
+                $documentNumber = $key + 1;
+                echo '<td class="text-center"><a href="' . api_get_path(WEB_CODE_PATH) . 'work/view.php?cidReq=' . $course_code . '&id_session=' . $sessionId .'&id=' . $results['id'] . '">(' . $documentNumber . ')</a></td>';
+                $qualification = !empty($results['qualification']) ? $results['qualification'] : '-';
+                echo '<td class="text-center">' . $qualification. '</td>';
+                echo '<td class="text-center">' . $results['formatted_date']. '</td>';
+                $assignment = get_work_assignment_by_id($work->id, $courseInfo['real_id']);
+
+                echo '<td class="text-center">';
+                if (!empty($assignment['expires_on'])) {
+                    echo api_convert_and_format_date($assignment['expires_on']);
+                }
+                echo '</td>';
 
-            foreach ($userworks as $work) {
-                $work = $work['work'];
-                foreach ($work->user_results as $key => $results) {
-                    echo '<tr>';
-                    echo '<td>' . $work->title . '</td>';
-                    $documentNumber = $key + 1;
-                    echo '<td class="text-center"><a href="' . api_get_path(WEB_CODE_PATH) . 'work/view.php?cidReq=' . $course_code . '&id_session=' . $sessionId .'&id=' . $results['id'] . '">(' . $documentNumber . ')</a></td>';
-                    $qualification = !empty($results['qualification']) ? $results['qualification'] : '-';
-                    echo '<td class="text-center">' . $qualification. '</td>';
-                    echo '<td class="text-center">' . $results['formatted_date']. '</td>';
-                    $assignment = get_work_assignment_by_id($work->id, $courseInfo['real_id']);
-
-                    echo '<td class="text-center">';
-                    if (!empty($assignment['expires_on'])) {
-                        echo api_convert_and_format_date($assignment['expires_on']);
-                    }
-                    echo '</td>';
-
-                    $fieldValue = new ExtraFieldValue('work');
-                    $resultExtra = $fieldValue->getAllValuesForAnItem(
-                        $work->id,
-                        true
-                    );
+                $fieldValue = new ExtraFieldValue('work');
+                $resultExtra = $fieldValue->getAllValuesForAnItem(
+                    $work->iid,
+                    true
+                );
 
-                    foreach ($resultExtra as $field) {
-                        $field = $field['value'];
-                        if (api_get_configuration_value('considered_working_time') == $field->getField()->getVariable()) {
-                            echo '<td class="text-center">' . $field->getValue() . '</td>';
-                        }
+                foreach ($resultExtra as $field) {
+                    $field = $field['value'];
+                    if ($workingTime == $field->getField()->getVariable()) {
+                        echo '<td class="text-center">' . $field->getValue() . '</td>';
                     }
-
-                    echo '</tr>';
                 }
+
+                echo '</tr>';
             }
+        }
 
-        echo '
-                    </tbody>
+        echo '</tbody>
                 </table>
             </div>
         ';
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index d56dbac883..c36335a2be 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -3832,14 +3832,13 @@ function processWorkForm(
                 // Get the "considered work time" defined for this work
                 $fieldValue = new ExtraFieldValue('work');
                 $resultExtra = $fieldValue->getAllValuesForAnItem(
-                    $workInfo['id'],
+                    $workId,
                     true
                 );
 
                 $workingTime = null;
                 foreach ($resultExtra as $field) {
                     $field = $field['value'];
-
                     if ($consideredWorkingTime == $field->getField()->getVariable()) {
                         $workingTime = $field->getValue();
                     }
@@ -3847,7 +3846,6 @@ function processWorkForm(
 
                 // If no time was defined, or a time of "0" was set, do nothing
                 if (!empty($workingTime)) {
-
                     // If some time is set, get the list of docs handed in by
                     // this student (to make sure we count the time only once)
                     $userWorks = get_work_user_list(