Fix shadowing