Fix shielding issues for NEAR