Fix NextSubject