Fix issue with rename stealing values.