Fixed confusing variable name conflict