Enrollment fix