- Fix shields not working correctly. Fixes #9966