Fix# crash on new school