Fix shadowing error
Fix var reference