Bugfix : unreachable branch code in rename