Fix bug due to shadowed variables

No match.