Fix variable rename issue.