Fix variable collision