diff --git a/src/utils/classes.ts b/src/utils/classes.ts
index 54524b5..78e27ac 100755
--- a/src/utils/classes.ts
+++ b/src/utils/classes.ts
@@ -500,8 +500,10 @@ function addQuestion(
 
     const i = data.findIndex((subject) => {
         return (
-            subj.toLowerCase() ===
-            getSubjNameWithoutYear(subject.Name).toLowerCase()
+            subject.Name &&
+            subj
+                .toLowerCase()
+                .includes(getSubjNameWithoutYear(subject.Name).toLowerCase())
         )
     })