Fixed regression related to var renaming while refactoring