fix variable name clash