Fixed variable name collision