Fixed argument name conflict