fix variable naming conflict