Fix current_student issue