Fix variable name conflict