Shield bug fix