fixing rename issue