diff --git a/src/logic/course.ts b/src/logic/course.ts
index 980153b..f471a10 100644
--- a/src/logic/course.ts
+++ b/src/logic/course.ts
@@ -1,6 +1,7 @@
 import {Assignment} from '@/components/app/app';
 import JsonUtils from '@/utils/json-utils';
 import Constants from '@/constants';
+import {FormatUtils} from '@/utils/format-utils';
 
 export default class Course
 {
@@ -38,7 +39,7 @@ export default class Course
     {
         this.id = courseJson.id;
         this.assignmentsId = courseJson.assignmentsId;
-        this.name = courseJson.name;
+        this.name = FormatUtils.parseText(courseJson.name).trim();
         this.teacherName = courseJson.teacherName;
         this.status = courseJson.status;
 
diff --git a/src/utils/course-utils.ts b/src/utils/course-utils.ts
index b369b51..4576a16 100644
--- a/src/utils/course-utils.ts
+++ b/src/utils/course-utils.ts
@@ -1,5 +1,5 @@
-import {Course} from '@/components/app/app';
 import {FormatUtils} from '@/utils/format-utils';
+import Course from '@/logic/course';
 
 const LEVEL_AP = {level: 'AP', scaleUp: 1};
 const LEVEL_H = {level: 'H', scaleUp: 0.75};
@@ -72,9 +72,6 @@ export class CourseUtils
     {
         for (let course of courses)
         {
-            // Parse name
-            course.name = FormatUtils.parseText(course.name).trim();
-
             // Detect level
             let level = this.detectLevel(course.name);
             if (level != undefined)