Shift AcademicYear fix