[#72700206] and fix jeffschools issue