Fixed variable name conflict