diff --git a/src/app/[lang]/timetable/calendar.ics/route.tsx b/src/app/[lang]/timetable/calendar.ics/route.tsx
index 5868a888..91210080 100644
--- a/src/app/[lang]/timetable/calendar.ics/route.tsx
+++ b/src/app/[lang]/timetable/calendar.ics/route.tsx
@@ -59,10 +59,10 @@ export async function GET(request: Request) {
 
                 return {
                     title: course.course.name_zh!,
-                    description: `${course.course.name_en!}\n${course.course.teacher_zh}\n${course.course.teacher_en}\nhttps://nthumods.com/courses/${course.course.raw_id}`,
+                    description: `${course.course.name_en!}\n${course.course.teacher_zh}\n${course.course.teacher_en}\nhttps://nthumods.com/courses/${encodeURIComponent(course.course.raw_id)}`,
                     location: course.venue,
-                    start: [semStart.getFullYear(), semStart.getMonth()+1, semStart.getDate()+course.dayOfWeek, getHours(start), getMinutes(start)],
-                    end: [semStart.getFullYear(), semStart.getMonth()+1, semStart.getDate()+course.dayOfWeek, getHours(end), getMinutes(end)],
+                    start: [semStart.getFullYear(), semStart.getMonth()+1, semStart.getDate()+1+course.dayOfWeek, getHours(start), getMinutes(start)],
+                    end: [semStart.getFullYear(), semStart.getMonth()+1, semStart.getDate()+1+course.dayOfWeek, getHours(end), getMinutes(end)],
                     calName: 'NTHUMods',
                     
                     recurrenceRule: `FREQ=WEEKLY;BYDAY=${day};INTERVAL=1;UNTIL=${formatDateTime(semEnd)}`
diff --git a/src/const/semester.ts b/src/const/semester.ts
index 174ffaad..565df533 100644
--- a/src/const/semester.ts
+++ b/src/const/semester.ts
@@ -6,7 +6,7 @@ export const semesterInfo = [
     // { id: '11110', year: 2022, semester: 1, begins: new Date(2022, 9-1, 12), ends: new Date(2023, 1-1, 13) },
     { id: '11120', year: 2022, semester: 2, begins: new Date(2023, 2-1, 13), ends: new Date(2023, 6-1, 16) },
     { id: '11210', year: 2023, semester: 1, begins: new Date(2023, 9-1, 11), ends: new Date(2024, 1-1, 12) },
-    { id: '11220', year: 2023, semester: 2, begins: new Date(2024, 2-1, 19), ends: new Date(2024, 6-1, 21) }
+    { id: '11220', year: 2023, semester: 2, begins: new Date(2024, 2-1, 19), ends: new Date(2024, 6-1, 23) }
 ]
 
 export const currentSemester = semesterInfo.find(semester => {