Fixing variable naming conflict