Fixed issue with collision of variable names