Merge "fixing bug of shadowing a variable"