AcademicYear fix