TrimEnd
BugFix on Enrollment