Fix bugs of enrollment