Fix local variable shadowing