diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index bba0bfaff6e1164063a8743987af67deb5074502..f874f972ba52b1f61138ba85b3204453a8c8b04d 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -620,8 +620,8 @@ BEGIN
     LEFT JOIN `disciplines_groups` ON disciplines_groups.DisciplineID = disciplines_teachers.DisciplineID
         # left -> inner join with maybe NULL ?
     LEFT JOIN `view_groups` ON view_groups.GroupID = disciplines_groups.GroupID
-    INNER JOIN `view_disciplines` ON disciplines_teachers.DisciplineID = view_disciplines.DisciplineID
-    INNER JOIN `view_disciplines_results` ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
+    LEFT JOIN `view_disciplines` ON disciplines_teachers.DisciplineID = view_disciplines.DisciplineID
+    LEFT JOIN `view_disciplines_results` ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
     WHERE disciplines_teachers.TeacherID = pTeacherID AND
             view_disciplines.SemesterID = @CurrentSemesterID
     ORDER BY    view_disciplines.GradeID ASC,
diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig
index 6bdbf70441857651de639e2512a5aadf98001284..8f993d58f41b2edb800a5e72e0182e33c52ae765 100644
--- a/~dev_rating/application/views/teacher/exam.twig
+++ b/~dev_rating/application/views/teacher/exam.twig
@@ -150,7 +150,7 @@
 							{% set td_class = 'additionalCell' %}
 						{% endif %}					
 
-						{% if r.Block == 'True' %}	
+						{% if r.Block == 'True' or (r.ModuleType != 'extra' and student.RateResult < 38) %}
 							<td class="staticCell {{ td_class }}" id="col_{{ col }}_row_{{ row }}"> 
 								<input type="text" value="{{ r.Rate  }}" disabled="disabled">
 							</td>