fixed a variable name conflict