Academicyear fix