Fixed shield problems