fix potential bug happend when rename