Use the declared variable
Merge pull request #3313 from marcioj/use-the-declared-variable

Use the declared variable