fix shadowing