diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 8bd3a08c73029abf4fdf7d5a93c6a7ca2bcb6680..cc4703b350a26d6cd63a05b483d5909f2b26e021 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -3614,6 +3614,8 @@ BEGIN
 		RETURN -1;
 	END IF;					 
 
+	SET maxRate = CalculateMaxRateForExtra(SubmoduleID, StudentID);
+	
 	SET isOver = 1;
     SET isLocked = 0;
     SET DisciplineID = -1;
@@ -3623,9 +3625,8 @@ BEGIN
     		disciplines.isMilestone, 
     		rating_table.StudentID, 
     		submodules.isUsed, 
-    		submodules.MaxRate,
     		modules.Type
-    INTO DisciplineID, isLocked, isOver, rateID, isUsed, maxRate, mtype
+    INTO DisciplineID, isLocked, isOver, rateID, isUsed, mtype
 	FROM `submodules`
 	INNER JOIN `modules` 				ON 	submodules.ModuleID = modules.ID
 	INNER JOIN `disciplines` 			ON 	modules.DisciplineID = disciplines.ID