Fix variable shadowing that makes the previous fix ineffective.
Merge pull request #376 from Alcaro/master

Fix variable shadowing that makes the previous fix ineffective.