Fix for problem with renaming of variables