Fixing shadowing