fixed var naming collision