Commit # RemoveUserErrFix