Fix register renaming problem