rename delegate method and bug fix