Fixing a variable name conflict