Shield Bugfix