Solving rename bug