Merge "Fix variable collision"