Tried to fix shield/helm bug, anders is on it!