resolve issue of rename