Fix variable shadowing that makes the previous fix ineffective.