fixed variable name conflict