diff --git a/main/admin/gradebook_dependency.php b/main/admin/gradebook_dependency.php
index 82c6a9e563..04f59ab4f9 100644
--- a/main/admin/gradebook_dependency.php
+++ b/main/admin/gradebook_dependency.php
@@ -169,17 +169,15 @@ foreach ($dependencyList as $courseId => $courseInfo) {
     $courseList[] = $courseInfo;
 }
 
-
 foreach ($userResult as $userId => &$userData) {
-    $courseListPassed = count(array_filter($userData['result_out_dependencies']));
-    $total =
-        count(array_filter($userData['result_dependencies'])) +
-        $courseListPassed
-    ;
-    $userData['course_list_passed'] = $courseListPassed;
-    $userData['course_list'] = count($userData['result_out_dependencies']);
+    $courseListPassedOutDependency = count(array_filter($userData['result_out_dependencies']));
+    $courseListPassedDependency = count(array_filter($userData['result_dependencies']));
+    $total = $courseListPassedDependency + $courseListPassedOutDependency;
+    $userData['course_list_passed_out_dependency'] = $courseListPassedOutDependency;
+    $userData['course_list_passed_out_dependency_count'] = count($userData['result_out_dependencies']);
     // Min req must apply + mandatory should be 20
-    $userData['final_result'] = $total >= $min && $userData['result_mandatory_20'] == 20;
+    //$userData['final_result'] = $total >= $min && $userData['result_mandatory_20'] == 20;
+    $userData['final_result'] = $total >= $min && $courseListPassedDependency == $totalDependencies;
 }
 
 $tpl->assign('current_url', $currentUrl);
diff --git a/main/template/default/admin/gradebook_dependency.tpl b/main/template/default/admin/gradebook_dependency.tpl
index f95418d2a9..83068b00ec 100644
--- a/main/template/default/admin/gradebook_dependency.tpl
+++ b/main/template/default/admin/gradebook_dependency.tpl
@@ -44,7 +44,8 @@
             {% endfor %}
 
             <td>
-                {{ user.course_list_passed }} / {{ user.course_list }}
+                {{ user.course_list_passed_out_dependency }} /
+                {{ user.course_list_passed_out_dependency_count }}
             </td>
 
             <td>