am 95d6192b: Merge "fixing bug of shadowing a variable"

* commit '95d6192bb0d255d8b45b596092bab152760a351f':
  fixing bug of shadowing a variable