Enrollment bug fix