Fixing a shadowing problem