Fixed side effect of name problem.