Fix variable name collision