fixed a potential name conflict in function fixing