Change method name and bug fix.