Fixed Enrollment Issue