fixed rename issue