fix shadowing problem