Try removing some shadowing