diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 34cdcb801ee4fbe605e4a3093e281f88aa1b804b..08cc8cbf3fd94cdd39a70f8961d297ef03ec7174 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -1193,6 +1193,7 @@ BEGIN
 		LEFT JOIN  `submodules` ON modules.ID = submodules.ModuleID
 		INNER JOIN `disciplines` ON modules.DisciplineID = disciplines.ID
 		INNER JOIN `subjects` 	ON disciplines.SubjectID = subjects.ID
+		WHERE modules.DisciplineID = DisciplineID
 		ORDER BY modules.OrderNum ASC, 
 				 submodules.OrderNum ASC;
  	ELSE 
@@ -2184,9 +2185,19 @@ BEGIN
     	RETURN -1;
 	END IF;
 
+	DELETE FROM `submodules`
+	WHERE submodules.ModuleID IN 
+		(	SELECT modules.ID
+			FROM `modules`
+			WHERE 	modules.isExam = 1 AND
+					modules.DisciplineID = DisciplineID
+			LIMIT 1
+		);
+
 
 	DELETE FROM `modules` 
-	WHERE modules.isExam = 1
+	WHERE 	modules.isExam = 1 AND
+			modules.DisciplineID = DisciplineID
 	LIMIT 1; 
 
 	RETURN 0;